Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci(shared): bump vendored ci files #204

Closed
wants to merge 1 commit into from
Closed

ci(shared): bump vendored ci files #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ci/vendir.lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ apiVersion: vendir.k14s.io/v1alpha1
directories:
- contents:
- git:
commitTitle: 'chore: add webhook config'
sha: 9d0f008e41df2f5d5e0461171c02fc0c4aee1d6f
commitTitle: 'chore: more generic test-on-docker-host'
sha: 0c17e2d69a71a42b83b8fbd0136abd27b8d97a74
path: .
path: ../.github/workflows/vendor
- contents:
- git:
commitTitle: 'chore: add webhook config'
sha: 9d0f008e41df2f5d5e0461171c02fc0c4aee1d6f
commitTitle: 'chore: more generic test-on-docker-host'
sha: 0c17e2d69a71a42b83b8fbd0136abd27b8d97a74
path: .
path: ./vendor
kind: LockConfig
4 changes: 2 additions & 2 deletions ci/vendir.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ directories:
- path: . # Copy this folder out to ..
git:
url: https://github.com/GaloyMoney/concourse-shared.git
ref: 9d0f008e41df2f5d5e0461171c02fc0c4aee1d6f
ref: 0c17e2d69a71a42b83b8fbd0136abd27b8d97a74
includePaths:
- shared/actions/*
excludePaths:
Expand All @@ -22,7 +22,7 @@ directories:
- path: .
git:
url: https://github.com/GaloyMoney/concourse-shared.git
ref: 9d0f008e41df2f5d5e0461171c02fc0c4aee1d6f
ref: 0c17e2d69a71a42b83b8fbd0136abd27b8d97a74
includePaths:
- shared/ci/**/*
excludePaths:
Expand Down
1 change: 1 addition & 0 deletions ci/vendor/pipeline-fragments.lib.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ plan:
- { get: repo, trigger: true }
- { get: pipeline-tasks }
- task: #@ container
attempts: 2
timeout: 12m
tags: ["galoy-staging"]
config:
Expand Down
6 changes: 3 additions & 3 deletions ci/vendor/tasks/test-on-docker-host.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ${SSH_PUB_KEY}
EOF
gcloud auth activate-service-account --key-file ${CI_ROOT}/gcloud-creds.json 2> /dev/null

gcloud_ssh "docker ps -qa | xargs docker rm -fv || true; sudo rm -rf ${REPO_PATH}"
gcloud_ssh "docker ps -qa | xargs docker rm -fv || true; sudo rm -rf ${REPO_PATH} || true; mkdir -p ${REPO_PATH} && cd ${REPO_PATH}/../ && rmdir $(basename ${REPO_PATH})"

pushd ${REPO_PATH}

Expand All @@ -42,11 +42,11 @@ 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=$(basename ${REPO_PATH}); source .envrc || true; 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}}'")

gcloud_ssh "cd ${REPO_PATH}; docker compose down --remove-orphans --timeout 1"
gcloud_ssh "cd ${REPO_PATH}; export COMPOSE_PROJECT_NAME=$(basename ${REPO_PATH}); docker compose down --remove-orphans --timeout 1"

exit $test_status
Loading