try #16 changing docker mirror

hashicorp · Oct 19, 2022 · f613656 · f613656
1 parent fc0f07b
commit f613656
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 46 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -87,13 +87,14 @@ jobs:
     steps:
       # get consul-k8s binary
       - uses: actions/checkout@v3
-      - run: sudo apt-get update
-      - run: sudo apt-get install -y qemu-user-static
-      - run: docker buildx create --use
-      - run:
-          name: make ci.dev-docker
-          working_directory: ./control-plane
-          command: make ci.dev-docker
+      - name: initialize buildx
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y qemu-user-static
+          docker buildx create --use
+      - name:
+        working_directory: ./control-plane
+        run: make ci.dev-docker
 
   acceptance:
     needs: dev-upload-docker

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -295,51 +295,22 @@ jobs:
       directory: cli 
       go-version: ${{ needs.get-go-version.outputs.go-version }}
 
- # Disabling for now until we get faster VMs to run acceptance tests. Faster VMs for Github Actions are supposed
- # to be available in the summer of 2022. For now, run the dev-upload docker and acceptance tests in CircleCI
+  # upload dev docker image
   dev-upload-docker:
-    if: github.repository_owner == 'hashicorp' # Do not run on forks as this requires secrets
-    needs: [get-product-version, build-distros]
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        arch: ["amd64"]
     env:
-      repo: ${{ github.event.repository.name }}
-      version: ${{ needs.get-product-version.outputs.product-version }}
+      DOCKER_CLI_EXPERIMENTAL: enabled
     steps:
+      # get consul-k8s binary
       - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v3
-        with:
-          name: consul-cni_${{ needs.get-product-version.outputs.product-version }}_linux_${{ matrix.arch }}.zip
-          path: control-plane/dist/cni/linux/${{ matrix.arch }}
-      - name: extract consul-cni zip
-        env:
-          ZIP_LOCATION: control-plane/dist/cni/linux/${{ matrix.arch }}
+      - name: initialize buildx
         run: |
-          cd "${ZIP_LOCATION}"
-          unzip -j *.zip
-      - name: Docker Build (Action)
-        uses: hashicorp/actions-docker-build@v1
-        with:
-          smoke_test: |
-            TEST_VERSION="$(docker run "${IMAGE_NAME}" consul-k8s-control-plane version  | awk '{print $2}')"
-            if [ "${TEST_VERSION}" != "v${version}" ]; then
-              echo "Test FAILED"
-              exit 1
-            fi
-            echo "Test PASSED"
-          version: ${{ env.version }}
-          target: release-default
-          arch: ${{ matrix.arch }}
-          pkg_name: consul-k8s-control-plane_${{ env.version }}
-          bin_name: consul-k8s-control-plane
-          workdir: control-plane
-          tags: |
-            docker.io/hashicorp/${{ env.repo }}-control-plane:${{ env.version }}
-          dev_tags: |
-            hashicorppreview/${{ env.repo }}-control-plane:${{ env.version }}
-            docker.io/hashicorppreview/${{ env.repo }}-control-plane:${{ env.version }}-${{ github.sha }}
+          sudo apt-get update
+          sudo apt-get install -y qemu-user-static
+          docker buildx create --use
+      - name:
+        working_directory: ./control-plane
+        run: make ci.dev-docker
 
 # TODO (agentless): re-enable once tproxy is supported
 #  acceptance-tproxy: