ci: wrap tilt ci tests in script to handle logs

GaloyMoney · Feb 2, 2024 · 4e2a325 · 4e2a325
1 parent 11f6ba8
commit 4e2a325
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -31,7 +31,7 @@ jobs:
           for LABEL in "${LABELS[@]}"; do
             case "$LABEL" in
               dashboard|consent|pay|core|admin-panel)
-                ARGS+=" --test $LABEL"
+                ARGS+=" $LABEL"
                 ;;
             esac
           done
@@ -40,4 +40,4 @@ jobs:
           echo "args=$ARGS" >> "$GITHUB_OUTPUT"
       - name: Tilt CI
         if: steps.prepare_args.outputs.args != ''
-        run: nix develop -c xvfb-run tilt --file dev/Tiltfile ci -- ${{ steps.prepare_args.outputs.args }}
+        run: nix develop -c xvfb-run ./dev/bin/tilt-ci.sh ${{ steps.prepare_args.outputs.args }}
diff --git a/ci/apps/app-template.lib.yml b/ci/apps/app-template.lib.yml
@@ -100,7 +100,7 @@ plan:
 #@ params["GOOGLE_CREDENTIALS"] = "((staging-gcp-creds.creds_json))"
 #@ params["SSH_PRIVATE_KEY"] = "((staging-ssh.ssh_private_key))"
 #@ params["SSH_PUB_KEY"] = "((staging-ssh.ssh_public_key))"
-#@ params["CMD"] = "tilt --file dev/Tiltfile ci -- --test " + app
+#@ params["CMD"] = "./dev/bin/tilt-ci.sh " + app
 name: #@ tilt_integration_test_name(app)
 serial: true
 plan:

diff --git a/ci/core/pipeline.yml b/ci/core/pipeline.yml
@@ -121,7 +121,7 @@ jobs:
   -  #@ build_edge_image(component)
   #@ end
   -  #@ build_edge_image("api", sub_file = "migrate")
-  -  #@ on_nix_host("core-bundle-integration-tests", "api", "tilt --file dev/Tiltfile ci -- --test core")
+  -  #@ on_nix_host("core-bundle-integration-tests", "api", "./dev/bin/tilt-ci.sh core")
   -  #@ on_nix_host("core-bundle-bats-tests", "api", "bats --setup-suite-file bats/ci_setup_suite.bash -t bats/core/**")
   - name: release-core-bundle
     plan:

diff --git a/dev/bin/tilt-ci.sh b/dev/bin/tilt-ci.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+apps="$@"
+
+REPO_ROOT=$(git rev-parse --show-toplevel)
+
+tilt --file dev/Tiltfile ci -- --test "$apps" \
+  | tee "${REPO_ROOT}/bats/.e2e-tilt.log" \
+  | grep -- "-test "
+status=${PIPESTATUS[0]}
+
+if [[ $status -eq 0 ]]; then
+  echo "Tilt CI passed"
+fi
+
+exit "$status"