diff --git a/.gitlab/ci/deploy.yml b/.gitlab/ci/deploy.yml index ee220774e5f..daac7e65d4b 100644 --- a/.gitlab/ci/deploy.yml +++ b/.gitlab/ci/deploy.yml @@ -1,8 +1,3 @@ -.deploy_job_template: - stage: deploy - image: $ESP_ENV_IMAGE - tags: [ deploy ] - .metrics_template: stage: deploy tags: [ fast_run, shiny ] @@ -26,23 +21,6 @@ - echo "Installing esp-metrics-cli tool" - pip install "esp-metrics-cli>=0.3,<1" -deploy_update_SHA_in_esp-dockerfiles: - extends: - - .deploy_job_template - - .before_script:minimal - - .rules:protected:deploy - dependencies: [] - variables: - GIT_DEPTH: 2 - tags: [build, shiny] - script: - - 'curl --header "PRIVATE-TOKEN: ${ESPCI_SCRIPTS_TOKEN}" -o create_MR_in_esp_dockerfile.sh $GITLAB_HTTP_SERVER/api/v4/projects/1260/repository/files/create_MR_in_esp_dockerfile%2Fcreate_MR_in_esp_dockerfile.sh/raw\?ref\=master' - - chmod +x create_MR_in_esp_dockerfile.sh - - ./create_MR_in_esp_dockerfile.sh - environment: - name: deploy_update_SHA_in_esp-dockerfiles_production - deployment_tier: production - target-examples-count-metrics: extends: - .metrics_template diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index 3252026d8fa..16c0a9a7ff9 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -220,12 +220,6 @@ rules: - <<: *if-protected-check -.rules:protected:deploy: - rules: - - <<: *if-qa-test-tag - when: never - - <<: *if-protected-deploy - .rules:master:push: rules: - <<: *if-master-push