From 142ea04b3801fbf743da41347e66e14f86740f93 Mon Sep 17 00:00:00 2001 From: CI Bot Date: Mon, 21 Aug 2023 07:50:40 +0000 Subject: [PATCH] ci(shared): bump vendored ci files --- ci/vendir.lock.yml | 8 ++++---- ci/vendir.yml | 4 ++-- ci/vendor/pipeline-fragments.lib.yml | 1 + ci/vendor/tasks/test-on-docker-host.sh | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ci/vendir.lock.yml b/ci/vendir.lock.yml index 978e5cd..94a6f61 100644 --- a/ci/vendir.lock.yml +++ b/ci/vendir.lock.yml @@ -2,14 +2,14 @@ apiVersion: vendir.k14s.io/v1alpha1 directories: - contents: - git: - commitTitle: 'chore: add webhook config' - sha: 9d0f008e41df2f5d5e0461171c02fc0c4aee1d6f + commitTitle: 'chore: use --attach on docker host' + sha: 9d971fd13c024c5f8e6888208a0311178453409d path: . path: ../.github/workflows/vendor - contents: - git: - commitTitle: 'chore: add webhook config' - sha: 9d0f008e41df2f5d5e0461171c02fc0c4aee1d6f + commitTitle: 'chore: use --attach on docker host' + sha: 9d971fd13c024c5f8e6888208a0311178453409d path: . path: ./vendor kind: LockConfig diff --git a/ci/vendir.yml b/ci/vendir.yml index 8655103..c118ba7 100644 --- a/ci/vendir.yml +++ b/ci/vendir.yml @@ -8,7 +8,7 @@ directories: - path: . # Copy this folder out to .. git: url: https://github.com/GaloyMoney/concourse-shared.git - ref: 9d0f008e41df2f5d5e0461171c02fc0c4aee1d6f + ref: 9d971fd13c024c5f8e6888208a0311178453409d includePaths: - shared/actions/* excludePaths: @@ -22,7 +22,7 @@ directories: - path: . git: url: https://github.com/GaloyMoney/concourse-shared.git - ref: 9d0f008e41df2f5d5e0461171c02fc0c4aee1d6f + ref: 9d971fd13c024c5f8e6888208a0311178453409d includePaths: - shared/ci/**/* excludePaths: diff --git a/ci/vendor/pipeline-fragments.lib.yml b/ci/vendor/pipeline-fragments.lib.yml index d343b32..d732327 100644 --- a/ci/vendor/pipeline-fragments.lib.yml +++ b/ci/vendor/pipeline-fragments.lib.yml @@ -134,6 +134,7 @@ plan: - { get: repo, trigger: true } - { get: pipeline-tasks } - task: #@ container + attempts: 2 timeout: 12m tags: ["galoy-staging"] config: diff --git a/ci/vendor/tasks/test-on-docker-host.sh b/ci/vendor/tasks/test-on-docker-host.sh index a18691c..1de6c7d 100755 --- a/ci/vendor/tasks/test-on-docker-host.sh +++ b/ci/vendor/tasks/test-on-docker-host.sh @@ -42,7 +42,7 @@ gcloud compute scp --ssh-key-file=${CI_ROOT}/login.ssh \ --zone=${host_zone} \ --project=${gcp_project} > /dev/null -gcloud_ssh "cd ${REPO_PATH}; export TMP_ENV_CI=tmp.env.ci; export COMPOSE_PROJECT_NAME=${REPO_PATH}; docker compose pull; docker compose -f docker-compose.yml up ${TEST_CONTAINER}" +gcloud_ssh "cd ${REPO_PATH}; export TMP_ENV_CI=tmp.env.ci; export COMPOSE_PROJECT_NAME=${REPO_PATH}; docker compose pull; docker compose -f docker-compose.yml up ${TEST_CONTAINER} --attach ${TEST_CONTAINER} 2>&1" container_id=$(gcloud_ssh "docker ps -q -f status=exited -f name=${PWD##*/}-${TEST_CONTAINER}-") test_status=$(gcloud_ssh "docker inspect $container_id --format='{{.State.ExitCode}}'")