diff --git a/.gitlab/ci/deploy.yml b/.gitlab/ci/deploy.yml index 7347b2ff7a..21d968b3df 100644 --- a/.gitlab/ci/deploy.yml +++ b/.gitlab/ci/deploy.yml @@ -32,8 +32,9 @@ push_to_github: extends: - .deploy_job_template - .before_script_minimal - - .rules:protected-no_label - dependencies: [] + - .rules:push_to_github + needs: + - check_submodule_sync script: - add_github_ssh_keys - git remote remove github &>/dev/null || true diff --git a/.gitlab/ci/docs.yml b/.gitlab/ci/docs.yml index 88bfa3ac48..7104f1c8e3 100644 --- a/.gitlab/ci/docs.yml +++ b/.gitlab/ci/docs.yml @@ -17,6 +17,9 @@ .if-protected-no_label: &if-protected-no_label if: '($CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_BRANCH =~ /^release\/v/ || $CI_COMMIT_TAG =~ /^v\d+\.\d+(\.\d+)?($|-)/) && $BOT_TRIGGER_WITH_LABEL == null' +.if-qa-test-tag: &if-qa-test-tag + if: '$CI_COMMIT_TAG =~ /^qa-test/' + .if-label-build_docs: &if-label-build_docs if: '$BOT_LABEL_BUILD_DOCS || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*build_docs(?:,[^,\n\r]+)*$/i' @@ -27,10 +30,12 @@ if: '$BOT_LABEL_DOCS_FAST || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*docs_fast(?:,[^,\n\r]+)*$/i' .if-dev-push: &if-dev-push - if: '$CI_COMMIT_REF_NAME != "master" && $CI_COMMIT_BRANCH !~ /^release\/v/ && $CI_COMMIT_TAG !~ /^v\d+\.\d+(\.\d+)?($|-)/ && ($CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event")' + if: '$CI_COMMIT_REF_NAME != "master" && $CI_COMMIT_BRANCH !~ /^release\/v/ && $CI_COMMIT_TAG !~ /^v\d+\.\d+(\.\d+)?($|-)/ && $CI_COMMIT_TAG !~ /^qa-test/ && ($CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event")' .doc-rules:build:docs: rules: + - <<: *if-qa-test-tag + when: never - <<: *if-protected - <<: *if-label-build_docs - <<: *if-label-docs diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index 998fd625ee..99a3561bfa 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -246,13 +246,16 @@ if: '$CI_COMMIT_TAG =~ /^v\d+\.\d+(\.\d+)?($|-)/' .if-protected: &if-protected - if: '($CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_BRANCH =~ /^release\/v/ || $CI_COMMIT_TAG =~ /^v\d+\.\d+(\.\d+)?($|-)/)' + if: '($CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_BRANCH =~ /^release\/v/ || $CI_COMMIT_TAG =~ /^v\d+\.\d+(\.\d+)?($|-)/) || $CI_COMMIT_TAG =~ /^qa-test/' .if-protected-no_label: &if-protected-no_label if: '($CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_BRANCH =~ /^release\/v/ || $CI_COMMIT_TAG =~ /^v\d+\.\d+(\.\d+)?($|-)/) && $BOT_TRIGGER_WITH_LABEL == null' +.if-qa-test-tag: &if-qa-test-tag + if: '$CI_COMMIT_TAG =~ /^qa-test/' + .if-dev-push: &if-dev-push - if: '$CI_COMMIT_REF_NAME != "master" && $CI_COMMIT_BRANCH !~ /^release\/v/ && $CI_COMMIT_TAG !~ /^v\d+\.\d+(\.\d+)?($|-)/ && ($CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event")' + if: '$CI_COMMIT_REF_NAME != "master" && $CI_COMMIT_BRANCH !~ /^release\/v/ && $CI_COMMIT_TAG !~ /^v\d+\.\d+(\.\d+)?($|-)/ && $CI_COMMIT_TAG !~ /^qa-test/ && ($CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event")' .if-merge_request: &if-merge_request if: '$CI_PIPELINE_SOURCE == "merge_request_event"' @@ -285,8 +288,10 @@ rules: - <<: *if-protected -.rules:protected-no_label: +.rules:push_to_github: rules: + - <<: *if-qa-test-tag + when: never - <<: *if-protected-no_label .rules:mr: