From 4a77b8d2ac5d4f3ccee5bf8688663d721eba645e Mon Sep 17 00:00:00 2001 From: bodymindarts Date: Thu, 4 May 2023 00:24:25 +0200 Subject: [PATCH 1/2] ci: add docker compose pull to integration test --- ci/vendor/tasks/chart-test-integration.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/vendor/tasks/chart-test-integration.sh b/ci/vendor/tasks/chart-test-integration.sh index 69e20cdb..c1fe036a 100755 --- a/ci/vendor/tasks/chart-test-integration.sh +++ b/ci/vendor/tasks/chart-test-integration.sh @@ -40,6 +40,7 @@ rsync --delete --exclude target -avr -e "ssh -l ${DOCKER_HOST_USER} ${ADDITIONAL echo "Done!" docker compose down --remove-orphans --timeout 1 +docker compose pull ssh ${ADDITIONAL_SSH_OPTS} ${DOCKER_HOST_USER}@${DOCKER_HOST_IP} \ "cd ${REPO_PATH}; docker compose -f docker-compose.yml up integration-tests" From 8dfc00ace1401ad054bf4c4ea6b3e0994976e233 Mon Sep 17 00:00:00 2001 From: bodymindarts Date: Thu, 4 May 2023 06:02:20 +0200 Subject: [PATCH 2/2] revert: "ci: add docker compose pull to integration test" This reverts commit 4a77b8d2ac5d4f3ccee5bf8688663d721eba645e. --- ci/vendor/tasks/chart-test-integration.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/vendor/tasks/chart-test-integration.sh b/ci/vendor/tasks/chart-test-integration.sh index c1fe036a..69e20cdb 100755 --- a/ci/vendor/tasks/chart-test-integration.sh +++ b/ci/vendor/tasks/chart-test-integration.sh @@ -40,7 +40,6 @@ rsync --delete --exclude target -avr -e "ssh -l ${DOCKER_HOST_USER} ${ADDITIONAL echo "Done!" docker compose down --remove-orphans --timeout 1 -docker compose pull ssh ${ADDITIONAL_SSH_OPTS} ${DOCKER_HOST_USER}@${DOCKER_HOST_IP} \ "cd ${REPO_PATH}; docker compose -f docker-compose.yml up integration-tests"