From 5521807e2cc8ee6d65c895a937bcba5c2ce10ab7 Mon Sep 17 00:00:00 2001 From: akhunti Date: Tue, 12 Apr 2022 15:41:49 +0530 Subject: [PATCH 1/2] Update Gitlab-CI to add SSA-Content builds to Pre-QA --- .gitlab-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f729c0b34b..dd1a9ddb94 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,12 @@ publish_build_to_pre_qa: script: - mkdir -p artifacts - pip install requests + + # Upload ESS-ContentUpdate build to Pre-QA - python security_content_automation/publish_build_to_pre_qa/publish_build_to_pre_qa.py --version $CI_COMMIT_REF_NAME --builds DA-ESS-ContentUpdate + + # Upload SSA-Content build to Pre-QA + - python security_content_automation/publish_build_to_pre_qa/publish_build_to_pre_qa.py --version $CI_COMMIT_REF_NAME --builds SSA_Content after_script: - cp publish_build_to_pre_qa.log artifacts/publish_build_to_pre_qa.log rules: From a8718b43ca700e58e5caaf89f0e3bba675347e17 Mon Sep 17 00:00:00 2001 From: truptilangalia-crest Date: Thu, 14 Apr 2022 17:40:52 +0530 Subject: [PATCH 2/2] test: added code to run pre-qa on schedule --- .gitlab-ci.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd1a9ddb94..8712b4c148 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,14 +15,13 @@ publish_build_to_pre_qa: script: - mkdir -p artifacts - pip install requests - - # Upload ESS-ContentUpdate build to Pre-QA - - python security_content_automation/publish_build_to_pre_qa/publish_build_to_pre_qa.py --version $CI_COMMIT_REF_NAME --builds DA-ESS-ContentUpdate - - # Upload SSA-Content build to Pre-QA - - python security_content_automation/publish_build_to_pre_qa/publish_build_to_pre_qa.py --version $CI_COMMIT_REF_NAME --builds SSA_Content + - VERSION=$(git tag --sort=-creatordate | head -n 1) + - echo "Build Version - $VERSION" + - python security_content_automation/publish_build_to_pre_qa/publish_build_to_pre_qa.py --version $VERSION --builds DA-ESS-ContentUpdate SSA_Content after_script: - cp publish_build_to_pre_qa.log artifacts/publish_build_to_pre_qa.log rules: - - if: '$CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+\.[0-9]$/' + - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]$/' + when: always + - if: '$CI_PIPELINE_SOURCE == "schedule"' when: always