fix envvar 2

hashicorp · Apr 18, 2023 · cbece51 · cbece51
1 parent 025240c
commit cbece51
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml
@@ -280,9 +280,8 @@ jobs:
       - name: Compatibility Integration Tests
         run: |
           mkdir -p "${{ env.TEST_RESULTS_DIR }}"
-          cd ./test/integration/consul-container
+          cd ./test/integration/consul-container/test/upgrade
           docker run --rm consul:local consul version
-          # shellcheck disable=SC2046
           gotestsum \
             --raw-command \
             --format=short-verbose \
@@ -295,11 +294,11 @@ jobs:
             -tags "${{ env.GOTAGS }}" \
             -timeout=30m \
             -json \
-            $(go list ./... | grep -v upgrade) \
+            ./.../upgrade/ \
             --target-image consul \
             --target-version local \
             --latest-image consul \
-            --latest-version latest
+            --latest-version ${{ env.CONSUL_VERSION 
           ls -lrt
         env:
           # this is needed because of incompatibility between RYUK container and circleci
@@ -349,23 +348,24 @@ jobs:
           mkdir -p "${{ env.TEST_RESULTS_DIR }}"
           cd ./test/integration/consul-container/test/upgrade
           docker run --rm consul:local consul version
+          PACKAGE_NAMES=$(go list -tags "${{ env.GOTAGS }}" ./...)
           gotestsum \
             --raw-command \
             --format=short-verbose \
             --debug \
             --rerun-fails=3 \
-            --packages="./..." \
+            --packages="${PACKAGE_NAMES}" \
             -- \
             go test \
             -p=4 \
             -tags "${{ env.GOTAGS }}" \
             -timeout=30m \
             -json \
-            ./.../upgrade/ \
+            ./... \
             --target-image consul \
             --target-version local \
             --latest-image consul \
-            --latest-version ${{ env.CONSUL_VERSION }}
+            --latest-version "${{ env.CONSUL_VERSION }}"
           ls -lrt
         env:
           # this is needed because of incompatibility between RYUK container and circleci