try #10 with only failing test

hashicorp · Oct 18, 2022 · f1507ad · f1507ad
1 parent f16aa25
commit f1507ad
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 26 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1208,33 +1208,34 @@ jobs:
 
 workflows:
   version: 2
-  test-and-build:
-    jobs:
-      # Build this one control-plane binary so that acceptance and acceptance-tproxy will run
-      # The rest of these CircleCI jobs have been migrated to Github Actions. We need to wait until
-      # the summer of 2022 for larger puplic Github Action VMs be available before the acceptance tests can
-      # be moved
-      - build-distro:
-          OS: "linux"
-          ARCH: "amd64 arm64"
-          name: build-distros-linux
-      - dev-upload-docker:
-          context: consul-ci
-          requires:
-            - build-distros-linux
-      # Run acceptance tests using the docker image built for the control plane
-      - acceptance:
-          context: consul-ci
-          requires:
-            - dev-upload-docker
-#      - acceptance-tproxy-cni:
-#          context: consul-ci
-#          requires:
-#            - dev-upload-docker
-#      - acceptance-tproxy:
+# Disable test and build for now as we switch over to github actions
+#  test-and-build:
+#    jobs:
+#      # Build this one control-plane binary so that acceptance and acceptance-tproxy will run
+#      # The rest of these CircleCI jobs have been migrated to Github Actions. We need to wait until
+#      # the summer of 2022 for larger puplic Github Action VMs be available before the acceptance tests can
+#      # be moved
+#      - build-distro:
+#          OS: "linux"
+#          ARCH: "amd64 arm64"
+#          name: build-distros-linux
+#      - dev-upload-docker:
 #          context: consul-ci
 #          requires:
-#            - dev-upload-docker
+#            - build-distros-linux
+#      # Run acceptance tests using the docker image built for the control plane
+##      - acceptance:
+##          context: consul-ci
+##          requires:
+##            - dev-upload-docker
+##      - acceptance-tproxy-cni:
+##          context: consul-ci
+##          requires:
+##            - dev-upload-docker
+##      - acceptance-tproxy:
+##          context: consul-ci
+##          requires:
+##            - dev-upload-docker
   nightly-acceptance-tests:
     triggers:
       - schedule:

diff --git a/.github/workflows/reusable-acceptance.yml b/.github/workflows/reusable-acceptance.yml
@@ -13,7 +13,7 @@ on:
       consul-k8s-image:
         required: false 
         type: string
-        default: docker.mirror.hashicorp.services/hashicorpdev/consul-k8s-control-plane:latest
+        default: docker.mirror.hashicorp.services/hashicorpdev/consul-k8s-control-plane:$(git rev-parse --short HEAD)
       directory:
         required: true
         type: string