From 21238400420526de9e1329b018adb83f3345d1f3 Mon Sep 17 00:00:00 2001 From: vermaas <vermaas@astron.nl> Date: Thu, 20 Oct 2022 10:47:43 +0200 Subject: [PATCH] fix type in new ci/cd pipeline --- .gitlab-ci.yml | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4775a40c..b5a933b3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,6 @@ docker-build-master: - docker push "$CI_REGISTRY_IMAGE" only: - master - - acceptance - release docker-build-branch: @@ -33,7 +32,6 @@ docker-build-branch: - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" except: - master - - acceptance - release # deploy test/dev version on 'sdc-dev.astron.nl' @@ -55,26 +53,6 @@ docker-deploy-master: only: - master - -# deploy acceptance version on 'dop457.astron.nl' -docker-deploy-acceptance: - image: docker:latest - stage: deploy - before_script: - - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )' - - eval $(ssh-agent -s) - - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - - - mkdir -p ~/.ssh - - chmod 700 ~/.ssh - - ssh-keyscan dop457.astron.nl >> ~/.ssh/known_hosts - - chmod 644 ~/.ssh/known_hosts - script: - - ssh -o StrictHostKeyChecking=no vermaas@dop457.astron.nl "docker pull "$CI_REGISTRY_IMAGE"" - - ssh -o StrictHostKeyChecking=no vermaas@dop457.astron.nl "docker-compose -p atdb -f /data/docker_compose/docker-compose-atdb-ldv-acc-cd.yml up -d" - when: manual - only: - - acceptance - # deploy release version on 'sdc.astron.nl' docker-deploy-release: image: docker:latest @@ -99,7 +77,7 @@ docker-deploy-release: # deploy master branch to 'sdc-dev.astron.nl' docker-deploy-to-test: image: docker:latest - stage: deploy-to-test + stage: deploy_to_test before_script: - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )' - eval $(ssh-agent -s) @@ -118,7 +96,7 @@ docker-deploy-to-test: # deploy master branch to 'sdc.astron.nl' docker-deploy-to-production: image: docker:latest - stage: deploy-to-production + stage: deploy_to_production before_script: - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )' - eval $(ssh-agent -s) @@ -133,4 +111,4 @@ docker-deploy-to-production: - ssh -o StrictHostKeyChecking=no sdco@dop821.astron.nl "docker-compose -p atdb -f /opt/dockercompose/atdb-ldv-compose/docker-compose-production-cd.yml up -d" when: manual only: - - release \ No newline at end of file + - master \ No newline at end of file -- GitLab