From 5cb81aca8224a691e5e3826ee9cf5c4bbddaf741 Mon Sep 17 00:00:00 2001 From: kirann Date: Thu, 10 Oct 2024 13:50:13 +0530 Subject: [PATCH 1/8] feat(SIGINT-2310): updating build script. --- .gitlab-ci.yml | 8 +++++--- Makefile | 4 ++-- vss-extension-dev.json | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 095e6f21..7f6d7bdf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,11 +59,12 @@ unit_test_and_coverage_job: before_script: - export EXT_VERSION=$(cat vss-extension.json | grep version | head -1 | awk -F= "{ print $2 }" | sed 's/[version:,\",]//g' | tr -d '[[:space:]]') - export ARTIFACTORY_UPLOAD_REPO=1 - - export SBOM_ART_TOKEN_VAULT_PATH=sbom/integrations/synopsys-extension-ci-cd + - export SBOM_ART_TOKEN_VAULT_PATH=sbom/integrations/blackduck-security-extension - export PRODUCT=Integrations - export GENERATE_CONFIGURATION_FILE=1 - - export PRODUCT_ADDON_SBOM_OPTIONS="--output-zipfile synopsys-extension-ci-cd-$EXT_VERSION.zip --debug" - - export GENERATION_OPTIONS="--entry integrations/mirrored-repos/synopsys-extension-ci-cd:synopsys-extension-ci-cd-$EXT_VERSION" + - export PRODUCT_ADDON_SBOM_OPTIONS="--output-zipfile blackduck-security-extension-$EXT_VERSION.zip --debug" + - export GENERATION_OPTIONS="--entry integrations/mirrored-repos/blackduck-security-extension:blackduck-security-extension-$EXT_VERSION" + generate_sbom: extends: @@ -73,6 +74,7 @@ generate_sbom: only: refs: - main + - SIGINT-2310 polaris_bridge: stage: analysis diff --git a/Makefile b/Makefile index 89d72b58..fbf310d8 100644 --- a/Makefile +++ b/Makefile @@ -9,9 +9,9 @@ build: echo "Provide the Build command like mvn install / go build / npm " dependencies: - echo "change directory to synopsys-task" + echo "change directory to blackduck-security-task" ifdef POP_BLACKDUCK_INPROGRESS - cd synopsys-task + cd blackduck-security-task endif image_scan: diff --git a/vss-extension-dev.json b/vss-extension-dev.json index fd80701d..a558d78c 100644 --- a/vss-extension-dev.json +++ b/vss-extension-dev.json @@ -28,7 +28,7 @@ }, "files": [ { - "path": "synopsys-task" + "path": "blackduck-security-extension" } ], "content": { From 5e41c2d41569bae84c418ce0c72698249278c40b Mon Sep 17 00:00:00 2001 From: kirann Date: Thu, 10 Oct 2024 13:50:13 +0530 Subject: [PATCH 2/8] feat(SIGINT-2310): updating build script. --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f6d7bdf..1e92c7ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,6 +98,7 @@ e2e-publish: tags: - linux extends: .extension-publish + allow_failure: true e2e-setup: stage: e2e-setup From aec3fc2b0fe7dc310b06977f2ce1fc7e74be8f67 Mon Sep 17 00:00:00 2001 From: kirann Date: Fri, 11 Oct 2024 23:47:10 +0530 Subject: [PATCH 3/8] feat(SIGINT-2310): updating build script. --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e92c7ea..435b4e0c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -106,6 +106,7 @@ e2e-setup: tags: - linux extends: .e2e-setup + allow_failure: true e2e-linux: stage: e2e From 495435d4d94f38e421b74f374d63003e9bde1b1a Mon Sep 17 00:00:00 2001 From: kirann Date: Sat, 12 Oct 2024 00:03:09 +0530 Subject: [PATCH 4/8] feat(SIGINT-2310): updating build script. --- .gitlab-ci.yml | 67 +------------------------------------------------- 1 file changed, 1 insertion(+), 66 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 435b4e0c..5ba31d53 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,9 +12,6 @@ include: - project: altair/altair-build-common ref: master file: gitlab/ci/altair_common.yml - - project: qa-automation/test-integrations - ref: main - file: _ci/e2e_azure.yml # List of job stages in their order of execution. @@ -24,11 +21,6 @@ stages: - versioning - analysis - sbom - - e2e-publish - - e2e-setup - - e2e - - e2e-cleanup - - notification variables: BUILD_TOOL: npm @@ -91,61 +83,4 @@ pop_blackduck: apt-get update -y apt-get install -y rsync make jq python3 python3-pip pip3 install blackduck requests - export RELEASE_VERSION=$(cat vss-extension.json | grep version | head -1 | awk -F= "{ print $2 }" | sed 's/[version:,\",]//g' | tr -d '[[:space:]]') - -e2e-publish: - stage: e2e-publish - tags: - - linux - extends: .extension-publish - allow_failure: true - -e2e-setup: - stage: e2e-setup - dependencies: [e2e-publish] - tags: - - linux - extends: .e2e-setup - allow_failure: true - -e2e-linux: - stage: e2e - dependencies: [e2e-publish,e2e-setup] - tags: - - linux - extends: .e2e-extension - variables: - XML_PATH_IN_JAR: $XML - RUNNER_NAME: "Linux" - RUNNER_OS: "Linux" - -e2e-mac: - stage: e2e - dependencies: [e2e-publish,e2e-setup] - tags: - - linux - extends: .e2e-extension - variables: - XML_PATH_IN_JAR: $XML - RUNNER_NAME: "Darwin" - RUNNER_OS: "Mac" - -e2e-windows: - stage: e2e - dependencies: [e2e-publish,e2e-setup] - tags: - - linux - extends: .e2e-extension - variables: - XML_PATH_IN_JAR: $XML - RUNNER_NAME: "Windows_NT" - RUNNER_OS: "Windows" - -e2e-clean-up: - stage: e2e-cleanup - dependencies: [e2e-publish,e2e-setup,e2e-linux,e2e-mac,e2e-windows] - tags: - - linux - extends: .e2e-clean-up - rules: - - when: always + export RELEASE_VERSION=$(cat vss-extension.json | grep version | head -1 | awk -F= "{ print $2 }" | sed 's/[version:,\",]//g' | tr -d '[[:space:]]') \ No newline at end of file From 43d42f26610d08724281d4761cd546ff480c632e Mon Sep 17 00:00:00 2001 From: kirann Date: Sat, 12 Oct 2024 00:04:16 +0530 Subject: [PATCH 5/8] feat(SIGINT-2310): updating build script. --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5ba31d53..00bcf12f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,6 +21,7 @@ stages: - versioning - analysis - sbom + - notification variables: BUILD_TOOL: npm @@ -51,13 +52,12 @@ unit_test_and_coverage_job: before_script: - export EXT_VERSION=$(cat vss-extension.json | grep version | head -1 | awk -F= "{ print $2 }" | sed 's/[version:,\",]//g' | tr -d '[[:space:]]') - export ARTIFACTORY_UPLOAD_REPO=1 - - export SBOM_ART_TOKEN_VAULT_PATH=sbom/integrations/blackduck-security-extension + - export SBOM_ART_TOKEN_VAULT_PATH=sbom/integrations/github-actions - export PRODUCT=Integrations - export GENERATE_CONFIGURATION_FILE=1 - export PRODUCT_ADDON_SBOM_OPTIONS="--output-zipfile blackduck-security-extension-$EXT_VERSION.zip --debug" - export GENERATION_OPTIONS="--entry integrations/mirrored-repos/blackduck-security-extension:blackduck-security-extension-$EXT_VERSION" - generate_sbom: extends: - .export_sbom_variables From 09dd5788477ee2528f78bc95d026b2c7205ab8ec Mon Sep 17 00:00:00 2001 From: kirann Date: Mon, 14 Oct 2024 16:14:45 +0530 Subject: [PATCH 6/8] feat(SIGINT-2310): updating build script. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00bcf12f..795045e8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,7 @@ unit_test_and_coverage_job: before_script: - export EXT_VERSION=$(cat vss-extension.json | grep version | head -1 | awk -F= "{ print $2 }" | sed 's/[version:,\",]//g' | tr -d '[[:space:]]') - export ARTIFACTORY_UPLOAD_REPO=1 - - export SBOM_ART_TOKEN_VAULT_PATH=sbom/integrations/github-actions + - export SBOM_ART_TOKEN_VAULT_PATH=sbom/integrations/blackduck-security-extension - export PRODUCT=Integrations - export GENERATE_CONFIGURATION_FILE=1 - export PRODUCT_ADDON_SBOM_OPTIONS="--output-zipfile blackduck-security-extension-$EXT_VERSION.zip --debug" From 1af04a7a7de52e5527bd0db5403a417204a8db76 Mon Sep 17 00:00:00 2001 From: kirann Date: Mon, 14 Oct 2024 16:18:22 +0530 Subject: [PATCH 7/8] updating gitlab.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 795045e8..00bcf12f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,7 @@ unit_test_and_coverage_job: before_script: - export EXT_VERSION=$(cat vss-extension.json | grep version | head -1 | awk -F= "{ print $2 }" | sed 's/[version:,\",]//g' | tr -d '[[:space:]]') - export ARTIFACTORY_UPLOAD_REPO=1 - - export SBOM_ART_TOKEN_VAULT_PATH=sbom/integrations/blackduck-security-extension + - export SBOM_ART_TOKEN_VAULT_PATH=sbom/integrations/github-actions - export PRODUCT=Integrations - export GENERATE_CONFIGURATION_FILE=1 - export PRODUCT_ADDON_SBOM_OPTIONS="--output-zipfile blackduck-security-extension-$EXT_VERSION.zip --debug" From d1c1f7a3f99f59644d2ff041a10584300b7c828b Mon Sep 17 00:00:00 2001 From: kirann Date: Mon, 14 Oct 2024 16:18:22 +0530 Subject: [PATCH 8/8] updating gitlab.yml file --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00bcf12f..2a2893c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -66,7 +66,6 @@ generate_sbom: only: refs: - main - - SIGINT-2310 polaris_bridge: stage: analysis