From 85b392d668e28ed366ea1610e5fc8f16026565c1 Mon Sep 17 00:00:00 2001 From: Daniel Perez Date: Fri, 22 Apr 2022 09:14:30 -0500 Subject: [PATCH 1/8] ci: updating gcp tagging image and fossa cli version --- app/sdms/devops/osdu/cloud-providers/gcp.yml | 6 +++--- .../cloud-providers/gcp-common-pipeline.yml | 20 +++++++++++++++---- .../osdu/scanners/fossa-common-pipeline.yml | 6 +++--- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/app/sdms/devops/osdu/cloud-providers/gcp.yml b/app/sdms/devops/osdu/cloud-providers/gcp.yml index 5b62a333..a055dbcb 100644 --- a/app/sdms/devops/osdu/cloud-providers/gcp.yml +++ b/app/sdms/devops/osdu/cloud-providers/gcp.yml @@ -22,7 +22,7 @@ sdms-osdu-gcp-helm-charts-release: sdms-osdu-gcp-containerize-gitlab: variables: SEISMIC_OSDU_GCP_DOCKERFILE_NAME: "docker/runtime.Dockerfile" - SEISMIC_OSDU_GCP_SERVICE: seismic-store + SEISMIC_OSDU_GCP_SERVICE: seismic-store extends: .osdu-gcp-containerize-gitlab before_script: - cd app/$SDMS_SERVICE @@ -99,7 +99,7 @@ sdms-osdu-gcp-deployment: SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_SERVICE: seismic-store-deploy SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/sdms/devops/gcp/deploy" SEISMIC_OSDU_GCP_SERVICE: seismic-store - SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$SEISMIC_OSDU_GCP_SERVICE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=$SEISMIC_OSDU_GCP_SERVICE-k8s" + SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=$SEISMIC_OSDU_GCP_SERVICE-k8s" extends: .osdu-gcp-deployment needs: ["sdms-osdu-gcp-containerize-gitlab", "sdms-osdu-gcp-deploy-configmap"] before_script: @@ -121,7 +121,7 @@ sdms-osdu-gcp-dev2-deploy-deployment: SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_SERVICE: seismic-store-deploy SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/sdms/devops/gcp/deploy" SEISMIC_OSDU_GCP_SERVICE: seismic-store - SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$SEISMIC_OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA" + SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA" extends: .osdu-gcp-dev2-deploy-deployment needs: ["sdms-osdu-gcp-containerize-gitlab", "sdms-osdu-gcp-dev2-deploy-configmap"] before_script: diff --git a/devops/osdu/cloud-providers/gcp-common-pipeline.yml b/devops/osdu/cloud-providers/gcp-common-pipeline.yml index ae5d4053..3d222e75 100644 --- a/devops/osdu/cloud-providers/gcp-common-pipeline.yml +++ b/devops/osdu/cloud-providers/gcp-common-pipeline.yml @@ -10,6 +10,19 @@ - gcloud config set project $OSDU_GCP_DEV2_PROJECT - gcloud container clusters get-credentials $OSDU_GCP_DEV2_CLUSTER --zone $OSDU_GCP_DEV2_ZONE --project $OSDU_GCP_DEV2_PROJECT - curl https://get.helm.sh/helm-v3.5.4-linux-amd64.tar.gz -s -o helm.tgz; tar -zxf helm.tgz; mv linux-amd64/helm /usr/local/bin/ + +.define_VER: &define_VER + - > + if [[ -z $CI_COMMIT_TAG ]] && [[ $CI_COMMIT_BRANCH =~ ^release\/[0-9]{1,2}.[0-9]{1,2}$ ]]; + then + RELEASE_VER=$(echo $CI_COMMIT_BRANCH | sed "s?^release/??"); + VER="$RELEASE_VER.0-release" + elif [[ $CI_COMMIT_TAG =~ ^v[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2}$ ]]; + then + VER=$(echo $CI_COMMIT_TAG | sed "s/^v//"); + else + VER="0.0.0-invalid"; + fi; .osdu-gcp-helm-charts-master: stage: build @@ -46,11 +59,10 @@ cache: {} allow_failure: true script: - - export EXTRA_DOCKER_TAG=""; if [ "$CI_COMMIT_TAG" != "" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/osdu-gcp-$SEISMIC_OSDU_GCP_SERVICE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_TAG" ; elif [ "$CI_COMMIT_REF_NAME" = "master" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/osdu-gcp-$SEISMIC_OSDU_GCP_SERVICE:latest" ; fi - - docker build -t $CI_REGISTRY_IMAGE/osdu-gcp-$SEISMIC_OSDU_GCP_SERVICE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA $EXTRA_DOCKER_TAG --file $SEISMIC_OSDU_GCP_DOCKERFILE_NAME . + - export EXTRA_DOCKER_TAG=""; if [ "$CI_COMMIT_TAG" != "" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/osdu-gcp-$CI_COMMIT_TAG" ; elif [ "$CI_COMMIT_REF_NAME" = "master" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/osdu-gcp:latest" ; fi + - docker build -t $OSDU_GCP_LOCAL_IMAGE_TAG_SHA $EXTRA_DOCKER_TAG --file $SEISMIC_OSDU_GCP_DOCKERFILE_NAME . - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - - docker push $CI_REGISTRY_IMAGE/osdu-gcp-$SEISMIC_OSDU_GCP_SERVICE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA - - docker push $CI_REGISTRY_IMAGE/osdu-gcp-$SEISMIC_OSDU_GCP_SERVICE + - docker push $CI_REGISTRY_IMAGE/osdu-gcp rules: - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/' when: on_success diff --git a/devops/osdu/scanners/fossa-common-pipeline.yml b/devops/osdu/scanners/fossa-common-pipeline.yml index 7cd95986..e342190a 100644 --- a/devops/osdu/scanners/fossa-common-pipeline.yml +++ b/devops/osdu/scanners/fossa-common-pipeline.yml @@ -1,5 +1,5 @@ .fossa-analyze-node: - image: $CI_REGISTRY/divido/fossa-cli-utilities/fossa-cli-utilities:v5.1 + image: $CI_REGISTRY/divido/fossa-cli-utilities/fossa-cli-utilities:v7.0 stage: scan tags: ['osdu-medium'] script: @@ -19,7 +19,7 @@ - merge_requests .fossa-check-notice: - image: $CI_REGISTRY/divido/fossa-cli/fossa-cli:v6.1 + image: $CI_REGISTRY/divido/fossa-cli/fossa-cli:v7.0 stage: scan tags: ['osdu-small'] script: @@ -99,7 +99,7 @@ - merge_requests .fossa-report: - image: $CI_REGISTRY/divido/fossa-cli/fossa-cli:v6.1 + image: $CI_REGISTRY/divido/fossa-cli/fossa-cli:v7.0 stage: scan tags: ['osdu-small'] script: -- GitLab From 0c9a6f30e21324b95ee65c0debc75ff49177fb2c Mon Sep 17 00:00:00 2001 From: Daniel Perez Date: Fri, 22 Apr 2022 09:36:06 -0500 Subject: [PATCH 2/8] ci: updating gcp tagging image and fossa cli version --- devops/osdu/scanners/fossa-common-pipeline.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devops/osdu/scanners/fossa-common-pipeline.yml b/devops/osdu/scanners/fossa-common-pipeline.yml index e342190a..733c0b0f 100644 --- a/devops/osdu/scanners/fossa-common-pipeline.yml +++ b/devops/osdu/scanners/fossa-common-pipeline.yml @@ -1,5 +1,5 @@ .fossa-analyze-node: - image: $CI_REGISTRY/divido/fossa-cli-utilities/fossa-cli-utilities:v7.0 + image: $CI_REGISTRY/divido/fossa-cli-utilities/fossa-cli-utilities:v6.1 stage: scan tags: ['osdu-medium'] script: @@ -19,7 +19,7 @@ - merge_requests .fossa-check-notice: - image: $CI_REGISTRY/divido/fossa-cli/fossa-cli:v7.0 + image: $CI_REGISTRY/divido/fossa-cli/fossa-cli:v6.1 stage: scan tags: ['osdu-small'] script: @@ -99,7 +99,7 @@ - merge_requests .fossa-report: - image: $CI_REGISTRY/divido/fossa-cli/fossa-cli:v7.0 + image: $CI_REGISTRY/divido/fossa-cli/fossa-cli:v6.1 stage: scan tags: ['osdu-small'] script: -- GitLab From 741e468da87bddb2a9bb9db0a40b14b03f9eeecc Mon Sep 17 00:00:00 2001 From: Daniel Perez Date: Fri, 22 Apr 2022 10:01:02 -0500 Subject: [PATCH 3/8] ci: updating gcp tagging image and fossa cli version --- app/filemetadata/.gitlab-ci.yml | 5 +- .../devops/osdu/cloud-providers/gcp.yml | 116 ------------------ .../osdu/scanners/fossa-common-pipeline.yml | 2 + 3 files changed, 3 insertions(+), 120 deletions(-) delete mode 100644 app/filemetadata/devops/osdu/cloud-providers/gcp.yml diff --git a/app/filemetadata/.gitlab-ci.yml b/app/filemetadata/.gitlab-ci.yml index 5e89251d..5a44cd52 100644 --- a/app/filemetadata/.gitlab-ci.yml +++ b/app/filemetadata/.gitlab-ci.yml @@ -8,7 +8,4 @@ include: # deploy # azure - - local: "app/filemetadata/devops/osdu/cloud-providers/azure.yml" - - # gcp - - local: "app/filemetadata/devops/osdu/cloud-providers/gcp.yml" \ No newline at end of file + - local: "app/filemetadata/devops/osdu/cloud-providers/azure.yml" \ No newline at end of file diff --git a/app/filemetadata/devops/osdu/cloud-providers/gcp.yml b/app/filemetadata/devops/osdu/cloud-providers/gcp.yml deleted file mode 100644 index d0955c72..00000000 --- a/app/filemetadata/devops/osdu/cloud-providers/gcp.yml +++ /dev/null @@ -1,116 +0,0 @@ -filemetadata-osdu-gcp-helm-charts-master: - variables: - SEISMIC_OSDU_GCP_HELM_CONFIG_DIR: "app/filemetadata/devops/gcp/configmap" - SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/filemetadata/devops/gcp/deploy" - extends: .osdu-gcp-helm-charts-master - -filemetadata-osdu-gcp-helm-charts-release: - variables: - SEISMIC_OSDU_GCP_HELM_CONFIG_DIR: "app/filemetadata/devops/gcp/configmap" - SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/filemetadata/devops/gcp/deploy" - extends: .osdu-gcp-helm-charts-release - -filemetadata-osdu-gcp-containerize-gitlab: - variables: - SEISMIC_OSDU_GCP_DOCKERFILE_NAME: "Dockerfile" - SEISMIC_OSDU_GCP_SERVICE: seismic-store-filemetadata - extends: .osdu-gcp-containerize-gitlab - before_script: - - cd app/$FILEMETADATA_SERVICE - - sed -i "s/SEGY_LIBRARY_PAT/$SEGY_LIBRARY_FEED_PAT/g" pip.conf - rules: - - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/' - when: on_success - changes: - - devops/**/* - - app/filemetadata/**/* - - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG' - when: on_success - changes: - - devops/**/* - - app/filemetadata/**/* - - if: '$OSDU_GCP == "true"' - when: on_success - changes: - - devops/**/* - - app/filemetadata/**/* - -filemetadata-osdu-gcp-deploy-configmap: - needs: ["filemetadata-osdu-gcp-containerize-gitlab"] - variables: - SEISMIC_OSDU_GCP_HELM_CONFIG_SERVICE: seismic-store-filemetadata-configmap - SEISMIC_OSDU_GCP_HELM_CONFIG_DIR: "app/filemetadata/devops/gcp/configmap" - SEISMIC_OSDU_GCP_HELM_CONFIG_SERVICE_VARS: "--set data.domain=$DOMAIN" - extends: .osdu-gcp-deploy-configmap - rules: - - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/' - when: on_success - changes: - - devops/**/* - - app/filemetadata/**/* - - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG' - when: on_success - changes: - - devops/**/* - - app/filemetadata/**/* - -filemetadata-osdu-gcp-dev2-deploy-configmap: - needs: ["filemetadata-osdu-gcp-containerize-gitlab"] - variables: - SEISMIC_OSDU_GCP_HELM_CONFIG_SERVICE: seismic-store-filemetadata-configmap - SEISMIC_OSDU_GCP_HELM_CONFIG_DIR: "app/filemetadata/devops/gcp/configmap" - SEISMIC_OSDU_GCP_HELM_CONFIG_SERVICE_VARS: "--set data.domain=$DOMAIN" - extends: .osdu-gcp-dev2-deploy-configmap - rules: - - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/' - when: on_success - changes: - - devops/**/* - - app/filemetadata/**/* - - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG' - when: on_success - changes: - - devops/**/* - - app/filemetadata/**/* - -filemetadata-osdu-gcp-deployment: - variables: - SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_SERVICE: seismic-store-filemetadata-deploy - SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/filemetadata/devops/gcp/deploy" - SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$SEISMIC_OSDU_GCP_SERVICE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA" - SEISMIC_OSDU_GCP_SERVICE: seismic-store-filemetadata - extends: .osdu-gcp-deployment - allow_failure: true - needs: ["filemetadata-osdu-gcp-containerize-gitlab", "filemetadata-osdu-gcp-deploy-configmap"] - rules: - - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/' - when: on_success - changes: - - devops/**/* - - app/filemetadata/**/* - - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG' - when: on_success - changes: - - devops/**/* - - app/filemetadata/**/* - -filemetadata-osdu-gcp-dev2-deploy-deployment: - variables: - SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_SERVICE: seismic-store-filemetadata-deploy - SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/filemetadata/devops/gcp/deploy" - SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$SEISMIC_OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA" - SEISMIC_OSDU_GCP_SERVICE: seismic-store-filemetadata - extends: .osdu-gcp-dev2-deploy-deployment - needs: ["filemetadata-osdu-gcp-containerize-gitlab", "filemetadata-osdu-gcp-dev2-deploy-configmap"] - allow_failure: true - rules: - - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/' - when: on_success - changes: - - devops/**/* - - app/filemetadata/**/* - - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG' - when: on_success - changes: - - devops/**/* - - app/filemetadata/**/* \ No newline at end of file diff --git a/devops/osdu/scanners/fossa-common-pipeline.yml b/devops/osdu/scanners/fossa-common-pipeline.yml index 733c0b0f..87b53107 100644 --- a/devops/osdu/scanners/fossa-common-pipeline.yml +++ b/devops/osdu/scanners/fossa-common-pipeline.yml @@ -7,6 +7,8 @@ # When building tags, this isn't defined by GitLab. In that case, we use the tag name instead. If that's not defined # then things will fail and we'll have to make this smarter - test -z "$CI_COMMIT_BRANCH" && export CI_COMMIT_BRANCH="$CI_COMMIT_TAG" + - npm install -g n + - n stable - npm ci --production - fossa analyze --project "${VAR_PROJECT_TITLE}" --project-url "${CI_PROJECT_URL}" --branch "${CI_COMMIT_BRANCH}" - fossa-check-for-licensing-issues -- GitLab From b64a6bc26ac73e04366b1c7a77bf102aa15852eb Mon Sep 17 00:00:00 2001 From: Daniel Perez Date: Fri, 22 Apr 2022 10:05:17 -0500 Subject: [PATCH 4/8] ci: updating gcp tagging image and fossa cli version --- devops/osdu/scanners/fossa-common-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/osdu/scanners/fossa-common-pipeline.yml b/devops/osdu/scanners/fossa-common-pipeline.yml index 87b53107..1eb366eb 100644 --- a/devops/osdu/scanners/fossa-common-pipeline.yml +++ b/devops/osdu/scanners/fossa-common-pipeline.yml @@ -8,7 +8,7 @@ # then things will fail and we'll have to make this smarter - test -z "$CI_COMMIT_BRANCH" && export CI_COMMIT_BRANCH="$CI_COMMIT_TAG" - npm install -g n - - n stable + - n 14 - npm ci --production - fossa analyze --project "${VAR_PROJECT_TITLE}" --project-url "${CI_PROJECT_URL}" --branch "${CI_COMMIT_BRANCH}" - fossa-check-for-licensing-issues -- GitLab From 01738d280f7d43b9d3f7c1ff33acb743dd2d8bf3 Mon Sep 17 00:00:00 2001 From: Daniel Perez Date: Fri, 22 Apr 2022 10:44:17 -0500 Subject: [PATCH 5/8] ci: updating GCP sdms rules --- app/sdms/devops/osdu/cloud-providers/gcp.yml | 33 +++++++++---------- .../osdu/scanners/fossa-common-pipeline.yml | 4 +-- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/app/sdms/devops/osdu/cloud-providers/gcp.yml b/app/sdms/devops/osdu/cloud-providers/gcp.yml index a055dbcb..cd2d35ed 100644 --- a/app/sdms/devops/osdu/cloud-providers/gcp.yml +++ b/app/sdms/devops/osdu/cloud-providers/gcp.yml @@ -58,12 +58,11 @@ sdms-osdu-gcp-deploy-configmap: - sed -i 's|#{SERVICE_ACCOUNT_SIGNER}#|'NA'|' ${SEISMIC_OSDU_GCP_HELM_CONFIG_DIR}/values.yaml - sed -i 's|#{DES_APPKEY}#|'NA'|' ${SEISMIC_OSDU_GCP_HELM_CONFIG_DIR}/values.yaml rules: - - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/' - when: on_success - changes: - - devops/**/* - - app/sdms/**/* - - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG' + - if: "$CI_COMMIT_BRANCH =~ /^release/" + when: never + - if: "$CI_COMMIT_TAG" + when: never + - if: '$OSDU_GCP == "true"' when: on_success changes: - devops/**/* @@ -105,12 +104,11 @@ sdms-osdu-gcp-deployment: before_script: - sed -i 's|#{SDMS_PREFIX}#|'$GCP_SDMS_PREFIX'|' ${SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_DIR}/values.yaml rules: - - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/' - when: on_success - changes: - - devops/**/* - - app/sdms/**/* - - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG' + - if: "$CI_COMMIT_BRANCH =~ /^release/" + when: never + - if: "$CI_COMMIT_TAG" + when: never + - if: '$OSDU_GCP == "true"' when: on_success changes: - devops/**/* @@ -165,12 +163,11 @@ sdms-osdu-gcp-test-python: - chmod +x ./tests/e2e/run_e2e_tests.sh - ./tests/e2e/run_e2e_tests.sh --seistore-svc-url="https://${OSDU_GCP_UNIT_HOSTNAME}${GCP_SDMS_PREFIX}" --seistore-svc-api-key="NA" --user-idtoken="$OSDU_GCP_INTEGRATION_TESTER" --tenant="${OSDU_GCP_TENANT}" --admin-email="${OSDU_GCP_SEISTORE_ADMIN_EMAIL}" --datapartition="${DATA_PARTITION_ID}" --legaltag01="${OSDU_GCP_SEISTORE_LEGALTAG01}" --legaltag02="${OSDU_GCP_SEISTORE_LEGALTAG02}" --VCS-Provider="${ISGITLAB}" rules: - - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/' - when: on_success - changes: - - devops/**/* - - app/sdms/**/* - - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG' + - if: "$CI_COMMIT_BRANCH =~ /^release/" + when: never + - if: "$CI_COMMIT_TAG" + when: never + - if: '$OSDU_GCP == "true"' when: on_success changes: - devops/**/* diff --git a/devops/osdu/scanners/fossa-common-pipeline.yml b/devops/osdu/scanners/fossa-common-pipeline.yml index 1eb366eb..7cd95986 100644 --- a/devops/osdu/scanners/fossa-common-pipeline.yml +++ b/devops/osdu/scanners/fossa-common-pipeline.yml @@ -1,5 +1,5 @@ .fossa-analyze-node: - image: $CI_REGISTRY/divido/fossa-cli-utilities/fossa-cli-utilities:v6.1 + image: $CI_REGISTRY/divido/fossa-cli-utilities/fossa-cli-utilities:v5.1 stage: scan tags: ['osdu-medium'] script: @@ -7,8 +7,6 @@ # When building tags, this isn't defined by GitLab. In that case, we use the tag name instead. If that's not defined # then things will fail and we'll have to make this smarter - test -z "$CI_COMMIT_BRANCH" && export CI_COMMIT_BRANCH="$CI_COMMIT_TAG" - - npm install -g n - - n 14 - npm ci --production - fossa analyze --project "${VAR_PROJECT_TITLE}" --project-url "${CI_PROJECT_URL}" --branch "${CI_COMMIT_BRANCH}" - fossa-check-for-licensing-issues -- GitLab From 4c8e3e2c2b8accdb39734a51af17a342f27c9741 Mon Sep 17 00:00:00 2001 From: Daniel Perez Date: Mon, 25 Apr 2022 09:16:54 -0500 Subject: [PATCH 6/8] ci: updating GCP rules --- app/sdms/devops/osdu/cloud-providers/gcp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/sdms/devops/osdu/cloud-providers/gcp.yml b/app/sdms/devops/osdu/cloud-providers/gcp.yml index cd2d35ed..3d340a52 100644 --- a/app/sdms/devops/osdu/cloud-providers/gcp.yml +++ b/app/sdms/devops/osdu/cloud-providers/gcp.yml @@ -209,4 +209,4 @@ sdms-osdu-gcp-dev2-test-python: when: on_success changes: - devops/**/* - - app/sdms/**/* \ No newline at end of file + - app/sdms/**/* -- GitLab From 5a30f20dd9279553534e4e2e39a6883d865d5a08 Mon Sep 17 00:00:00 2001 From: Daniel Perez Date: Tue, 26 Apr 2022 15:49:44 -0500 Subject: [PATCH 7/8] ci: update ibm and aws jobs --- app/sdms/devops/osdu/cloud-providers/aws.yml | 1 + app/sdms/devops/osdu/cloud-providers/ibm.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/app/sdms/devops/osdu/cloud-providers/aws.yml b/app/sdms/devops/osdu/cloud-providers/aws.yml index b5b9e152..c9e682fa 100644 --- a/app/sdms/devops/osdu/cloud-providers/aws.yml +++ b/app/sdms/devops/osdu/cloud-providers/aws.yml @@ -47,6 +47,7 @@ sdms_aws-containerize: - merge_requests sdms_aws-update-eks: + allow_failure: true extends: - .aws-update-eks needs: ['sdms_aws-containerize'] diff --git a/app/sdms/devops/osdu/cloud-providers/ibm.yml b/app/sdms/devops/osdu/cloud-providers/ibm.yml index d8c73b56..9b7abba6 100644 --- a/app/sdms/devops/osdu/cloud-providers/ibm.yml +++ b/app/sdms/devops/osdu/cloud-providers/ibm.yml @@ -53,6 +53,7 @@ sdms_ibm-test-py: - svctoken=$(python3 ../../devops/scripts/ibm_jwt_client.py) - echo $svctoken > /dev/null - npm install -g newman + - npm install - chmod +x ./tests/e2e/run_e2e_tests.sh - ./tests/e2e/run_e2e_tests.sh --seistore-svc-url="https://${SEISMIC_HOST}/api/v3" --seistore-svc-api-key="NA" --user-idtoken="$svctoken" --tenant="${IBM_SEISMIC_E2E_TENANT}" --admin-email="${IBM_SEISMIC_E2E_ADMIN_EMAIL}" --datapartition="${IBM_SEISMIC_E2E_DATA_PARTITION}" --legaltag01="${IBM_SEISMIC_E2E_LEGALTAG01}" --legaltag02="${IBM_SEISMIC_E2E_LEGALTAG02}" --newuser="${IBM_SEISMIC_E2E_NEWUSER}" --VCS-Provider="gitlab" --subproject="${IBM_SEISMIC_E2E_SUBPROJECT}" only: -- GitLab From e3bc384dc7cc5859bb067c4fa8876d17291e6387 Mon Sep 17 00:00:00 2001 From: Daniel Perez Date: Tue, 26 Apr 2022 16:19:33 -0500 Subject: [PATCH 8/8] ci: update ibm and aws jobs --- app/sdms/devops/osdu/cloud-providers/ibm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/sdms/devops/osdu/cloud-providers/ibm.yml b/app/sdms/devops/osdu/cloud-providers/ibm.yml index 9b7abba6..e9a14e66 100644 --- a/app/sdms/devops/osdu/cloud-providers/ibm.yml +++ b/app/sdms/devops/osdu/cloud-providers/ibm.yml @@ -44,6 +44,7 @@ sdms_ibm-test-py: extends: - .ibm-test-py needs: ["sdms_ibm-deploy"] + allow_failure: true script: - cd app/$SDMS_SERVICE - apt-get update @@ -53,7 +54,6 @@ sdms_ibm-test-py: - svctoken=$(python3 ../../devops/scripts/ibm_jwt_client.py) - echo $svctoken > /dev/null - npm install -g newman - - npm install - chmod +x ./tests/e2e/run_e2e_tests.sh - ./tests/e2e/run_e2e_tests.sh --seistore-svc-url="https://${SEISMIC_HOST}/api/v3" --seistore-svc-api-key="NA" --user-idtoken="$svctoken" --tenant="${IBM_SEISMIC_E2E_TENANT}" --admin-email="${IBM_SEISMIC_E2E_ADMIN_EMAIL}" --datapartition="${IBM_SEISMIC_E2E_DATA_PARTITION}" --legaltag01="${IBM_SEISMIC_E2E_LEGALTAG01}" --legaltag02="${IBM_SEISMIC_E2E_LEGALTAG02}" --newuser="${IBM_SEISMIC_E2E_NEWUSER}" --VCS-Provider="gitlab" --subproject="${IBM_SEISMIC_E2E_SUBPROJECT}" only: -- GitLab