From aa8aeac5da3bdf3bfb563fe43d4e9fa98374acb4 Mon Sep 17 00:00:00 2001 From: Sergei Petrosian Date: Tue, 27 Aug 2024 16:04:14 +0200 Subject: [PATCH] Remove extra GITHUB_ORG, Move LINUXSYSTEMROLES_DOMAIN to vars --- .github/workflows/tft.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tft.yml b/.github/workflows/tft.yml index 16522ea..b4cedb7 100644 --- a/.github/workflows/tft.yml +++ b/.github/workflows/tft.yml @@ -164,14 +164,13 @@ jobs: variables: "ANSIBLE_VER=${{ matrix.ansible_version }};\ REPO_NAME=${{ github.event.repository.name }};\ GITHUB_ORG=${{ github.repository_owner }};\ - GITHUB_ORG=linux-system-roles;\ PR_NUM=${{ github.event.issue.number }};\ ARTIFACTS_DIR=${{ steps.set_vars.outputs.ARTIFACTS_DIR }};\ ARTIFACTS_URL=${{ steps.set_vars.outputs.ARTIFACTS_URL }};\ - TEST_LOCAL_CHANGES=false" + TEST_LOCAL_CHANGES=false;\ + LINUXSYSTEMROLES_DOMAIN=${{ vars.LINUXSYSTEMROLES_DOMAIN }}" # Note that LINUXSYSTEMROLES_SSH_KEY must be single-line, TF doesn't read multi-line variables fine. secrets: "LINUXSYSTEMROLES_USER=${{ secrets.LINUXSYSTEMROLES_USER }};\ - LINUXSYSTEMROLES_DOMAIN=${{ secrets.LINUXSYSTEMROLES_DOMAIN }};\ LINUXSYSTEMROLES_SSH_KEY=${{ secrets.LINUXSYSTEMROLES_SSH_KEY }}" compose: ${{ matrix.platform }} # There are two blockers for using public ranch: