diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index afcbebe753640f620699677cc8bbdf9c7e7c3ca7..6ad792454f97a9fb530762dc9ec08c7b933b7288 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -244,15 +244,11 @@ deploy-uc4-workload-generator: allow_failure: true - -# New from here - -.deploy_theo: +# hope this can be merged with .deploy soon, see #51 +.deploy_theodolite: stage: deploy tags: - exec-dind - # see https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled - # for image usage and settings for building with TLS and docker in docker image: docker:19.03.1 services: - docker:19.03.1-dind @@ -271,7 +267,6 @@ deploy-uc4-workload-generator: - if: "$DOCKERHUB_ORG && $DOCKERHUB_ID && $DOCKERHUB_PW && $IMAGE_NAME && $PROJECT_PATH && $CI_COMMIT_TAG" when: always - changes: - # - $JAVA_PROJECT_NAME/**/* # hope this can be simplified soon, see #51 - execution/**/* if: "$DOCKERHUB_ORG && $DOCKERHUB_ID && $DOCKERHUB_PW && $IMAGE_NAME && $PROJECT_PATH" when: always @@ -293,5 +288,4 @@ deploy-theodolite: when: always - if: "$DOCKERHUB_ORG && $DOCKERHUB_ID && $DOCKERHUB_PW && $IMAGE_NAME && $PROJECT_PATH" when: manual - allow_failure: true - + allow_failure: true \ No newline at end of file