Skip to content

Commit af45d66

Browse files
committed
ci: build integration tests in concourse before run
1 parent 4f32e21 commit af45d66

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

ci/apps/app-template.lib.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ plan:
5656
#@ params["GOOGLE_CREDENTIALS"] = "((staging-gcp-creds.creds_json))"
5757
#@ params["SSH_PRIVATE_KEY"] = "((staging-ssh.ssh_private_key))"
5858
#@ params["SSH_PUB_KEY"] = "((staging-ssh.ssh_public_key))"
59-
#@ params["CMD"] = "./dev/bin/tilt-ci.sh " + app
59+
#@ params["CMD"] = "./dev/bin/tilt-ci-with-build.sh " + app
6060
name: #@ tilt_integration_test_name(app)
6161
serial: true
6262
plan:

ci/core/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jobs:
120120
- #@ build_edge_image(component)
121121
#@ end
122122
- #@ build_edge_image("api", sub_file = "migrate")
123-
- #@ on_nix_host("core-bundle-integration-tests", "api", "./dev/bin/tilt-ci.sh core")
123+
- #@ on_nix_host("core-bundle-integration-tests", "api", "./dev/bin/tilt-ci-with-build.sh core")
124124
- #@ on_nix_host("core-bundle-bats-tests", "api", "bats --setup-suite-file bats/ci_setup_suite.bash -t bats/core/**")
125125
- name: release-core-bundle
126126
plan:

dev/bin/tilt-ci-with-build.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
3+
REPO_ROOT=$(git rev-parse --show-toplevel)
4+
5+
build_args=$(
6+
"$REPO_ROOT/dev/bin/prepare-tilt-ci-with-build.sh" "$@" \
7+
| grep "build_args=" \
8+
| cut -d '=' -f 2-
9+
)
10+
buck2 build $build_args
11+
12+
"$REPO_ROOT/dev/bin/tilt-ci.sh" "$@"

0 commit comments

Comments
 (0)