Add 'make deploy exercise' to CI

hashicorp · Oct 23, 2023 · b0ddb9b · b0ddb9b
1 parent da6722b
commit b0ddb9b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -29,8 +29,8 @@ jobs:
           path: ${{ env.TARBALL_FILE }}
 
   acceptance:
-    needs:
-      - test
+    # needs:
+    #   - test
     strategy:
       fail-fast: false
       matrix:
@@ -51,6 +51,11 @@ jobs:
       - run: pip install yq
         shell: bash
 
+      # Checkout this repo.
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        with:
+          path: "vault-k8s"
+
       # Checkout vault-helm for acceptance test code.
       - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
         with:
@@ -75,7 +80,12 @@ jobs:
           docker image load --input vault-k8s-image.docker.tar
           kind load docker-image hashicorp/vault-k8s:0.0.0-dev
 
+      - name: Makefile tests
+        working-directory: vault-k8s
+        run: make deploy exercise teardown
+
       - name: bats tests
+        working-directory: vault-helm
         run: |
           yq --in-place --yaml-roundtrip '.injector.image.tag |= "0.0.0-dev"' ./vault-helm/values.yaml
           bats ./vault-helm/test/acceptance -t --filter injector
diff --git a/Makefile b/Makefile
@@ -37,7 +37,7 @@ image: build
 
 # Deploys Vault dev server and a locally built Agent Injector.
 # Run multiple times to deploy new builds of the injector.
-deploy: image
+deploy:
 	kind load docker-image hashicorp/vault-k8s:$(VERSION)
 	helm upgrade --install vault vault $(VAULT_HELM_FLAGS) \
 		--set "injector.enabled=false"