update PR with latest changes that work in enterprise

hashicorp · Apr 13, 2023 · a669f10 · a669f10
1 parent 605b626
commit a669f10
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml
@@ -21,6 +21,7 @@ env:
   GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }}
   GOTESTSUM_VERSION: "1.9.0"
   CONSUL_BINARY_UPLOAD_NAME: consul-bin
+  CONSUL_LATEST_IMAGE_NAME: ${{ github.repository }}
 
 jobs:
   setup:
@@ -251,8 +252,8 @@ jobs:
           name: ${{ env.TEST_RESULTS_ARTIFACT_NAME }}
           path: ${{ env.TEST_RESULTS_DIR }}
 
-  compatibility-integration-test:
-    runs-on: ubuntu-latest
+ compatibility-integration-test:
+    runs-on: ${{ fromJSON(needs.setup.outputs.compute-xl) }}
     needs:
       - setup
       - dev-build
@@ -277,12 +278,12 @@ jobs:
         run: chmod +x consul
 
       - name: Build consul:local image
-        run: docker build -t consul:local -f ./build-support/docker/Consul-Dev.dockerfile .
+        run: docker build -t ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local -f ./build-support/docker/Consul-Dev.dockerfile .
       - name: Compatibility Integration Tests
         run: |
             mkdir -p "/tmp/test-results"
-            cd ./test/integration/consul-container/test
-            docker run --rm consul:local consul version
+            cd ./test/integration/consul-container
+            docker run --rm ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local consul version
             # shellcheck disable=SC2046
             gotestsum \
               --raw-command \
@@ -293,13 +294,13 @@ jobs:
               -- \
               go test \
               -p=4 \
-              -tags "" \
+              -tags "${{ env.GOTAGS }}" \
               -timeout=30m \
               -json \
               $(go list ./... | grep -v upgrade) \
-              --target-image consul \
+              --target-image ${{ env.CONSUL_LATEST_IMAGE_NAME }} \
               --target-version local \
-              --latest-image consul \
+              --latest-image ${{ env.CONSUL_LATEST_IMAGE_NAME }} \
               --latest-version latest
             ls -lrt
         env:
@@ -316,7 +317,7 @@ jobs:
           path: ${{ env.TEST_RESULTS_DIR }}
 
   upgrade-integration-test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ fromJSON(needs.setup.outputs.compute-xl) }}
     needs:
       - setup
       - dev-build
@@ -345,12 +346,13 @@ jobs:
       - name: restore mode+x
         run: chmod +x consul
       - name: Build consul:local image
-        run: docker build -t consul:local -f ./build-support/docker/Consul-Dev.dockerfile .
+        run: docker build -t ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local -f ./build-support/docker/Consul-Dev.dockerfile .
       - name: Upgrade Integration Tests
         run: |
           mkdir -p "${{ env.TEST_RESULTS_DIR }}"
           cd ./test/integration/consul-container/test/upgrade
-          docker run --rm consul:local consul version
+          docker run --rm ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local consul version
+          # shellcheck disable=SC2046
           PACKAGE_NAMES=$(go list -tags "${{ env.GOTAGS }}" ./...)
           gotestsum \
             --raw-command \
@@ -365,9 +367,9 @@ jobs:
             -timeout=30m \
             -json \
             ./... \
-            --target-image consul \
+            --target-image ${{ env.CONSUL_LATEST_IMAGE_NAME }} \
             --target-version local \
-            --latest-image consul \
+            --latest-image ${{ env.CONSUL_LATEST_IMAGE_NAME }} \
             --latest-version "${{ env.CONSUL_VERSION }}"
           ls -lrt
         env: