diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8c97638fee7fa3802e013f931eb9e4f99e3a29dd..de34b1f81815c0db6a25bd2a26f021afdff36a82 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -183,10 +183,6 @@ download_plugins: script: - mvn dependency:copy -DrepoUrl=$OSM_PACKAGE_REGISTRY_URL -Dartifact="org.opengroup.osdu:os-osm-postgres:$OSM_VERSION:jar:plugin" -Dtransitive=false -DoutputDirectory="./tmp" rules: - - if: "$CI_COMMIT_BRANCH =~ /^release/" - when: never - - if: "$CI_COMMIT_TAG" - when: never - if: "$PROTECTED == '1'" when: on_success diff --git a/devops/core-plus/pipeline/override-stages.yml b/devops/core-plus/pipeline/override-stages.yml index 52b196c1027537022b970c8b41f8dc1ddae31223..91a905558e3e2af3792787f5979068cea28f812d 100644 --- a/devops/core-plus/pipeline/override-stages.yml +++ b/devops/core-plus/pipeline/override-stages.yml @@ -8,7 +8,6 @@ core-containerize-bootstrap-gitlab: variables: CORE_IMAGE_BOOTSTRAP_NAME: "core-plus-bootstrap-partition" - core-containerize-gitlab: stage: containerize needs: ["compile-and-unit-test", "download_plugins"] @@ -28,9 +27,9 @@ core-containerize-gitlab: - docker push $CI_REGISTRY_IMAGE/$TEST_IMAGE rules: - if: "$CI_COMMIT_BRANCH =~ /^release/" - when: never + when: on_success - if: "$CI_COMMIT_TAG" - when: never + when: on_success - if: "$CORE == '1'" when: on_success @@ -90,8 +89,8 @@ core-test: expire_in: 1 days rules: - if: "$CI_COMMIT_BRANCH =~ /^release/" - when: never + when: on_success - if: "$CI_COMMIT_TAG" - when: never + when: on_success - if: "$CORE == '1'" when: on_success