diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 57740d4edfbe52938606ef3344438cdd9daa3f38..3966a5932eaa57e7e6c5fd99a5c1402524993d74 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -172,29 +172,6 @@ prepare_ci_lta_docker_image: - docker push ${REGISTRY_PATH}/ci_lta:$CI_COMMIT_SHORT_SHA interruptible: true -prepare_ci_mac_docker_image: - stage: prepare - before_script: - - *prepare_ssh - - *prepare_registry - - apk add rsync - variables: - LOFAR_TARGET: lcs155.control.lofar - environment: - name: ci_mac # DO NOT REMOVE ENVIRONMENT PROVIDES NECESSARY PROTECTION / KEYS - needs: - - prepare_ci_base_docker_image - script: - - rsync lofarsys@${LOFAR_TARGET}:/nas/software/WinCC_3.16/*.rpm ./ - - docker pull ${REGISTRY_PATH}/ci_mac:latest || true - - docker pull ${REGISTRY_PATH}/ci_base:$CI_COMMIT_SHORT_SHA - - docker tag ${REGISTRY_PATH}/ci_base:$CI_COMMIT_SHORT_SHA ci_base:$CI_COMMIT_SHORT_SHA - - docker build --build-arg BASE_VERSION=$CI_COMMIT_SHORT_SHA -t ${REGISTRY_PATH}/ci_mac:$CI_COMMIT_SHORT_SHA -f Docker/lofar-ci/Dockerfile_ci_mac . - - docker push ${REGISTRY_PATH}/ci_mac:$CI_COMMIT_SHORT_SHA - interruptible: true - allow_failure: true - when: manual # we don't build/deploy mac for lofar1 anymore. So, allow_failure=true and when=manual. If and only if we do need to release an emergency fix, then we will make sure this build chain for mac works again - # # BUILD STAGE # @@ -589,7 +566,6 @@ deploy-image-caches: - ci_lofar_pipeline - ci_lofar_pulp - ci_lofar_tbbwriter_control - - ci_mac - ci_tmss - lofar-base - lta_ingest