ci(shared): bump vendored ci files

GaloyMoney · Aug 22, 2023 · 448ae91 · 448ae91
1 parent 739de47
commit 448ae91
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/ci/vendir.lock.yml b/ci/vendir.lock.yml
@@ -2,14 +2,14 @@ apiVersion: vendir.k14s.io/v1alpha1
 directories:
 - contents:
   - git:
-      commitTitle: 'chore: retry test-on-docker'
-      sha: 95c4fd73e3a8aa92e4b52b97e4066a1f6bdb19ab
+      commitTitle: 'chore: more generic test-on-docker-host'
+      sha: 0c17e2d69a71a42b83b8fbd0136abd27b8d97a74
     path: .
   path: ../.github/workflows/vendor
 - contents:
   - git:
-      commitTitle: 'chore: retry test-on-docker'
-      sha: 95c4fd73e3a8aa92e4b52b97e4066a1f6bdb19ab
+      commitTitle: 'chore: more generic test-on-docker-host'
+      sha: 0c17e2d69a71a42b83b8fbd0136abd27b8d97a74
     path: .
   path: ./vendor
 kind: LockConfig
diff --git 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: 95c4fd73e3a8aa92e4b52b97e4066a1f6bdb19ab
+      ref: 0c17e2d69a71a42b83b8fbd0136abd27b8d97a74
     includePaths:
     - shared/actions/*
     excludePaths:
@@ -20,7 +20,7 @@ directories:
   - path: .
     git:
       url: https://github.com/GaloyMoney/concourse-shared.git
-      ref: 95c4fd73e3a8aa92e4b52b97e4066a1f6bdb19ab
+      ref: 0c17e2d69a71a42b83b8fbd0136abd27b8d97a74
     includePaths:
     - shared/ci/**/*
     excludePaths:

diff --git a/ci/vendor/tasks/test-on-docker-host.sh b/ci/vendor/tasks/test-on-docker-host.sh
@@ -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}
 
@@ -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