From 6d2aecc06ca190ad02e57d59defb78ea12f774a2 Mon Sep 17 00:00:00 2001 From: Marcel Feix Date: Tue, 14 Jun 2022 16:16:29 +0200 Subject: [PATCH] feat(Docker Compose): Test Docker Compose --- .gitlab-ci.yml | 20 +++--------- test/{ => docker-compose}/docker-compose.yml | 0 test/docker-compose/test.gitlab-ci.yml | 32 ++++++++++++++++++++ 3 files changed, 37 insertions(+), 15 deletions(-) rename test/{ => docker-compose}/docker-compose.yml (100%) create mode 100644 test/docker-compose/test.gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0080611..7a16941 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,6 @@ stages: include: - local: 'templates/releasing/release.gitlab-ci.yml' - local: 'templates/releasing/release-gitlab.gitlab-ci.yml' - - local: 'templates/IaC/docker-compose.gitlab-ci.yml' - local: 'templates/documentations/documentation.gitlab-ci.yml' Test-Java-Backend: @@ -26,20 +25,11 @@ Test-Docker-compose: - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH when: always - when: manual - extends: .docker-compose-deploy - variables: - SCP_DESTINATION: "/tmp" - SCP_SOURCE: "$CI_PROJECT_DIR/test/docker-compose.yml" - COMPOSE_EXTRA_ARGS: "-f test/docker-compose.yml" - SSH_URL: "ci-cd.dev.exxcellent.de" - SSH_USER: "user" - SSH_PORT: "22" - DOCKER_REGISTRY: "$CI_REGISTRY" - ENV_SETUP_FILE: "setup_env.sh" - SSH_PRIVATE_KEY_DEPLOY: $SSH_PRIVATE_KEY - after_script: - - ssh $SSH_USER@$SSH_URL "if [ -f test.log ]; then exit 1; rm test.log; fi" - - ssh $SSH_USER@$SSH_URL "if [ -f docker-compose.yml ]; then exit 1; rm docker-compose.yml; fi" + trigger: + strategy: depend + include: + - local: "test/docker-compose/test.gitlab-ci.yml" + check_confluence_validity: extends: .documentation-check-confluence-validity diff --git a/test/docker-compose.yml b/test/docker-compose/docker-compose.yml similarity index 100% rename from test/docker-compose.yml rename to test/docker-compose/docker-compose.yml diff --git a/test/docker-compose/test.gitlab-ci.yml b/test/docker-compose/test.gitlab-ci.yml new file mode 100644 index 0000000..c988850 --- /dev/null +++ b/test/docker-compose/test.gitlab-ci.yml @@ -0,0 +1,32 @@ +stages: + - compose + - verify + +include: + - local: 'templates/IaC/docker-compose.gitlab-ci.yml' + - local: 'templates/IaC/ssh-transfer-data.gitlab-ci.yml' + +Docker-compose: + stage: compose + rules: + - when: always + extends: .docker-compose-deploy + variables: + SCP_DESTINATION: "/tmp" + SCP_SOURCE: "$CI_PROJECT_DIR/test/docker-compose.yml" + COMPOSE_EXTRA_ARGS: "-f test/docker-compose.yml" + SSH_URL: "ci-cd.dev.exxcellent.de" + SSH_USER: "user" + SSH_PORT: "22" + DOCKER_REGISTRY: "$CI_REGISTRY" + ENV_SETUP_FILE: "setup_env.sh" + SSH_PRIVATE_KEY_DEPLOY: $SSH_PRIVATE_KEY + +Test-Files: + stage: verify + rules: + when: always + extends: .ssh-transfer-data + script: + - ssh $SSH_USER@$SSH_URL "if [ -f test.log ]; then exit 1; rm test.log; fi" + - ssh $SSH_USER@$SSH_URL "if [ -f docker-compose.yml ]; then exit 1; rm docker-compose.yml; fi"