From 82d78c7c7ddfbf2eb12b9c58346ada274ff4a213 Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Wed, 17 May 2023 10:12:15 +0800 Subject: [PATCH] ci: fix update_sha_in_esp-dockerfiles rules --- .gitlab/ci/deploy.yml | 3 +-- .gitlab/ci/rules.yml | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab/ci/deploy.yml b/.gitlab/ci/deploy.yml index 1841f66f47..e2bd864bc7 100644 --- a/.gitlab/ci/deploy.yml +++ b/.gitlab/ci/deploy.yml @@ -43,8 +43,7 @@ push_to_github: deploy_update_SHA_in_esp-dockerfiles: extends: - .deploy_job_template - - .rules:ref:master-always - - .rules:tag:release + - .rules:protected-no_label-always 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 diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index 154e2013ed..31725449d8 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -373,6 +373,11 @@ rules: - <<: *if-protected-no_label +.rules:protected-no_label-always: + rules: + - <<: *if-protected-no_label + when: always + .rules:dev: rules: - <<: *if-trigger