diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d44cac7ab4..e26acbc2f11 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,6 +29,5 @@ include: - ".gitlab/ci/pre_check.yml" - ".gitlab/ci/build.yml" - ".gitlab/ci/host-test.yml" - - ".gitlab/ci/deploy.yml" - ".gitlab/ci/post_deploy.yml" - ".gitlab/ci/test-win.yml" diff --git a/.gitlab/ci/deploy.yml b/.gitlab/ci/deploy.yml deleted file mode 100644 index c25fa7a8692..00000000000 --- a/.gitlab/ci/deploy.yml +++ /dev/null @@ -1,21 +0,0 @@ -.deploy_job_template: - stage: deploy - image: $ESP_ENV_IMAGE - tags: [ deploy ] - -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 diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index ea1d3b9ce61..7cd939739f7 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -206,12 +206,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