Merge branch 'slb/dperez50/fix-filemetadata-pipeline' of...

Merge branch 'slb/dperez50/fix-filemetadata-pipeline' of https://community.opengroup.org/osdu/platform/domain-data-mgmt-services/seismic/seismic-dms-suite/seismic-store-service into slb/dperez50/fix-filemetadata-pipeline

app/sdms/devops/osdu/build/seismic-store-service.yml

@@ -13,7 +13,7 @@ sdms_compile-and-unit-test:
     - cd app/$SDMS_SERVICE
     - chmod +x devops/scripts/utest_build_run.sh
     - devops/scripts/utest_build_run.sh
-  only:
-    changes:
+  rules:
+    - changes:
       - devops/**/*
       - app/sdms/**/*

app/sdms/devops/osdu/cloud-providers/aws.yml

@@ -41,12 +41,11 @@ sdms_aws-containerize:
     - docker tag $LOCAL_IMAGE_TAG $AWS_IMAGE_TAG_BASE:latest
     - docker push $AWS_IMAGE_TAG_BASE:$CI_COMMIT_SHA
     - docker push $AWS_IMAGE_TAG_BASE:latest
-  only:
-    variables:
-      - $AWS == 'true'
-    changes:
+  rules:
+    - changes:
       - devops/**/*
       - app/sdms/**/*
+      if: $AWS == 'true'
 
 sdms_aws-update-eks:
   extends:
@@ -66,12 +65,11 @@ sdms_aws-update-eks:
     - chmod 644 $KUBECONFIG
     - kubectl -n osdu-services rollout restart deployment/${AWS_EKS_DEPLOYMENT_NAME}
     - kubectl -n osdu-services rollout status -w deployment/${AWS_EKS_DEPLOYMENT_NAME} --timeout=900s
-  only:
-    variables:
-      - $AWS_SKIP_DEPLOY != 'true' && $AWS == 'true' && $AWS_DEPLOY_TARGET == 'EKS'
-    changes:
+  rules:
+    - changes:
       - devops/**/*
       - app/sdms/**/*
+      if: $AWS_SKIP_DEPLOY != 'true' && $AWS == 'true' && $AWS_DEPLOY_TARGET == 'EKS'
       
 sdms_aws-test-newman:
   extends:
@@ -88,12 +86,11 @@ sdms_aws-test-newman:
     - npm install -g newman
     - chmod +x ./tests/e2e/run_e2e_tests.sh
     - ./tests/e2e/run_e2e_tests.sh --seistore-svc-url=${SEISMICSTORE_SVC_URL} --seistore-svc-api-key="NA" --user-idtoken="$svctoken" --user-idtoken="$svctoken" --tenant=opendes --subproject=awsdemosubproject --admin-email="${AWS_COGNITO_AUTH_PARAMS_USER}" --datapartition=opendes --legaltag01=opendes-sdmstestlegaltag --legaltag02=opendes-sdmstestlegaltag --subproject-long-name=subprojectlonggggggggggggggggggggggname --VCS-Provider="${ISGITLAB}"
-  only:
-    variables:
-      -  $AWS == 'true'
-    changes:
+  rules:
+    - changes:
       - devops/**/*
       - app/sdms/**/*
+      if: $AWS == 'true'
   artifacts:
     when: always
     paths:

app/sdms/devops/osdu/cloud-providers/azure.yml

@@ -34,12 +34,11 @@ sdms_push_runtime_image_azure:
     - docker push ${AZURE_REGISTRY}.azurecr.io/$SHA_IMAGE
     - docker tag $SDMS_UTEST_RUNTIME_IMAGE ${AZURE_REGISTRY}.azurecr.io/$LATEST_IMAGE
     - docker push ${AZURE_REGISTRY}.azurecr.io/$LATEST_IMAGE
-  only:
-    variables:
-      - $AZURE == 'true'
-    changes:
+  rules:
+    - changes:
       - devops/**/*
       - app/sdms/**/*
+      if: $AZURE == 'true'
   
 sdms_azure_deploy:
   tags: ["osdu-medium"]
@@ -79,12 +78,11 @@ sdms_azure_deploy:
     - pod=$(kubectl get pod -n osdu|grep $SDMS_PROJECT_NAME |tail -1 |awk '{print $1}')
     - status=$(kubectl wait -n osdu --for=condition=Ready pod/$pod --timeout=600s)
     - if [[ "$status" != *"met"* ]]; then echo "POD didn't start correctly" ; exit 1 ; fi
-  only:
-    variables:
-      - $AZURE == 'true'
-    changes:
+  rules:
+    - changes:
       - devops/**/*
       - app/sdms/**/*
+      if: $AZURE == 'true'
           
 sdms_azure_test:
   tags: ["osdu-medium"]
@@ -107,9 +105,8 @@ sdms_azure_test:
     - npm install -g newman
     - chmod +x ./tests/e2e/run_e2e_tests.sh
     - ./tests/e2e/run_e2e_tests.sh --seistore-svc-url="https://${AZURE_DNS_NAME}/seistore-svc/api/v3" --seistore-svc-api-key="NA" --user-idtoken="$svctoken" --user1-idtoken="$svctoken" --tenant="${E2E_TENANT}" --subproject="${E2E_SUBPROJECT}" --admin-email="${E2E_ADMIN_EMAIL}" --datapartition="${E2E_DATA_PARTITION}" --legaltag01="${E2E_LEGALTAG01}" --legaltag02="${E2E_LEGALTAG02}" --subproject-long-name="${E2E_SUBPROJECT_LONG_NAME}" --VCS-Provider="${ISGITLAB}"
-  only:
-    variables:
-      - $AZURE == 'true'
-    changes:
+  rules:
+    - changes:
       - devops/**/*
-      - app/sdms/**/*
\ No newline at end of file
+      - app/sdms/**/*
+      if: $AZURE == 'true'
\ No newline at end of file

app/sdms/devops/osdu/cloud-providers/gcp.yml

@@ -58,14 +58,12 @@ sdms_osdu-gcp-helm-charts:
     - helm package $OSDU_GCP_HELM_PACKAGE_CHARTS --destination helm-charts
     - helm repo index --url "${CI_SERVER_URL}/${CI_PROJECT_PATH}/-/jobs/${CI_JOB_ID}/artifacts/raw" .
     - mv index.yaml helm-charts
-  only:
-    variables:
-      - $GCP == 'true'
-      - $OSDU_GCP == 'true'
-      - $OSDU_GCP_HELM_PACKAGE_CHARTS
-    changes:
+  rules:
+    - changes:
       - devops/**/*
       - app/sdms/**/*
+      if: $GCP == 'true' && $OSDU_GCP == 'true' && $OSDU_GCP_HELM_PACKAGE_CHARTS
+    
 
 sdms_push_runtime_image_gcp:
   image: gcr.io/google.com/cloudsdktool/cloud-sdk
@@ -81,12 +79,11 @@ sdms_push_runtime_image_gcp:
     # GCP Container Registry
     - cd app/$SDMS_SERVICE
     - gcloud builds submit --config provider/$GCP_VENDOR/cloudbuild/cloudbuild.yaml --substitutions=_GCP_SERVICE=$GCP_SERVICE,_APPLICATION_NAME=$GCP_APPLICATION_NAME,_PROVIDER_NAME=$GCP_VENDOR,_SHORT_SHA=$CI_COMMIT_SHORT_SHA,_PORT=$PORT
-  only:
-    variables:
-      - $GCP == 'true'
-    changes:
+  rules:
+    - changes:
       - devops/**/*
       - app/sdms/**/*
+      if: $GCP == 'true'
 
 sdms_osdu-gcp-containerize-gcloud:
   stage: containerize
@@ -100,12 +97,11 @@ sdms_osdu-gcp-containerize-gcloud:
     - gcloud config set project $OSDU_GCP_PROJECT
     - touch .gcloudignore
     - gcloud builds submit --config provider/$OSDU_GCP_SERVICE-$OSDU_GCP_VENDOR/cloudbuild/cloudbuild.yaml --substitutions=_GCP_SERVICE=$OSDU_GCP_SERVICE,_APPLICATION_NAME=$OSDU_GCP_APPLICATION_NAME,_PROVIDER_NAME=$OSDU_GCP_VENDOR,_SHORT_SHA=$CI_COMMIT_SHORT_SHA,_PORT=$OSDU_GCP_PORT
-  only:
-    variables:
-      - $OSDU_GCP == 'true'
-    changes:
+  rules:
+    - changes:
       - devops/**/*
       - app/sdms/**/*
+      if: $OSDU_GCP == 'true'
 
 sdms_osdu-gcp-containerize-gitlab:
   stage: containerize
@@ -121,12 +117,11 @@ sdms_osdu-gcp-containerize-gitlab:
     - docker build -t $CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA $EXTRA_DOCKER_TAG --file docker/runtime.Dockerfile .
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - docker push $CI_REGISTRY_IMAGE/osdu-gcp
-  only:
-    variables:
-      - $OSDU_GCP == 'true'
-    changes:
+  rules:
+    - changes:
       - devops/**/*
       - app/sdms/**/*
+      if: $OSDU_GCP == 'true'
 
 sdms_osdu-gcp-deploy:
   image: gcr.io/google.com/cloudsdktool/cloud-sdk
@@ -148,12 +143,11 @@ sdms_osdu-gcp-deploy:
       $OSDU_GCP_CLOUD_RUN_PARAMETERS
       --set-env-vars=LOG_LEVEL=${OSDU_GCP_LOG_LEVEL:="INFO"},$OSDU_GCP_ENV_VARS
     - gcloud run services update-traffic $OSDU_GCP_APPLICATION_NAME --platform managed --region $OSDU_GCP_CLOUDRUN_REGION --to-latest
-  only:
-    variables:
-      - $OSDU_GCP == 'true'
-    changes:
+  rules:
+    - changes:
       - devops/**/*
       - app/sdms/**/*
+      if: $OSDU_GCP == 'true'
 
 sdms_osdu-gcp-tagging:
   image: google/cloud-sdk

app/sdms/devops/osdu/cloud-providers/ibm.yml

@@ -18,12 +18,11 @@ sdms_ibm-deploy:
     - oc get bc/$SDMS_PROJECT_NAME 2> /dev/null || oc new-build --name $SDMS_PROJECT_NAME --binary --strategy source --image-stream openshift/ubi8-nodejs-14
     - oc start-build $SDMS_PROJECT_NAME --from-dir=. --follow
     - oc get service $SDMS_PROJECT_NAME 2> /dev/null || oc new-app $SDMS_PROJECT_NAME
-  only:
-    variables:
-      - $IBM == 'true'
-    changes:
+  rules:
+    - changes:
       - devops/**/*
       - app/sdms/**/*
+      if: $IBM == 'true'
       
 sdms_ibm-deploy-devpri:
   extends: .ibm
@@ -62,12 +61,11 @@ sdms_ibm-test:
     - npm install -g newman
     - 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" --user1-idtoken="$svctoken" --tenant="${IBM_SEISMIC_E2E_TENANT}" --subproject="${IBM_SEISMIC_E2E_SUBPROJECT}" --admin-email="${IBM_SEISMIC_E2E_ADMIN_EMAIL}" --datapartition="${IBM_SEISMIC_E2E_DATA_PARTITION}" --legaltag01="${IBM_SEISMIC_E2E_LEGALTAG01}" --legaltag02="${IBM_SEISMIC_E2E_LEGALTAG02}" --subproject-long-name="${IBM_SEISMIC_E2E_SUBPROJECT_LONG_NAME}" --newuser="${IBM_SEISMIC_E2E_NEWUSER}" --VCS-Provider="gitlab"
-  only:
-    variables:
-      - $IBM == 'true'
-    changes:
+  rules:
+    - changes:
       - devops/**/*
       - app/sdms/**/*
+      if: $IBM == 'true'
 
 sdms_ibm-preship-promote:
   extends: .ibm

app/sdms/devops/osdu/contenerize/osdu.yml

@@ -18,7 +18,7 @@ sdms_push_runtime_image:
     - docker push $CI_REGISTRY_IMAGE/$SHA_IMAGE
     - docker tag $SDMS_UTEST_RUNTIME_IMAGE $CI_REGISTRY_IMAGE/$LATEST_IMAGE
     - docker push $CI_REGISTRY_IMAGE/$LATEST_IMAGE
-  only:
+  rules:
     changes:
       - devops/**/*
       - app/sdms/**/*
\ No newline at end of file

app/sdms/devops/osdu/scanners/fossa-global.yml

@@ -10,12 +10,11 @@ sdms_fossa-check-notice:
   stage: attribution
   needs: ['sdms_fossa-analyze']
   tags: ['osdu-small']
-  only:
-    variables:
-      - $FOSSA_API_KEY
-    changes:
+  rules:
+    - changes:
       - devops/**/*
       - app/sdms/**/*
+      if: $FOSSA_API_KEY
   artifacts:
     when: on_failure
     paths:
@@ -117,14 +116,11 @@ sdms_fossa-report:
   stage: attribution
   needs: ['sdms_fossa-analyze']
   tags: ['osdu-small']
-  only:
-    variables:
-      # To get the FOSSA_ACCESS, log into the project's main page and generate a "Live Project Report" URL from the Summary tab
-      # The access token will be shown in the URL (the last path component)
-      - $FOSSA_API_KEY && $FOSSA_ACCESS
-    changes:
+  rules:
+    - changes:
       - devops/**/*
       - app/sdms/**/*
+      if: $FOSSA_API_KEY && $FOSSA_ACCESS
 
   variables:
     FOSSA_REPORT_URL: https://app.fossa.com/api/revisions/custom%2B12773%2F${SDMS_PROJECT_NAME}%24${CI_COMMIT_SHA}/attribution?access=${FOSSA_ACCESS}&includeProjectLicense=true&includeLicenseScan=true&includeDirectDependencies=true&includeDeepDependencies=true&includeLicenseHeaders=&includeLicenseList=true&format=HTML

app/sdms/devops/osdu/scanners/fossa-node.yml

@@ -17,9 +17,8 @@ sdms_fossa-analyze:
     - npm ci --production
     - fossa analyze --project "${SDMS_PROJECT_TITLE}" --project-url "${CI_PROJECT_URL}" --branch "${CI_COMMIT_BRANCH}"
     - fossa-check-for-licensing-issues
-  only:
-    variables:
-      - $FOSSA_API_KEY
-    changes:
+  rules:
+    - changes:
       - devops/**/*
-      - app/sdms/**/*
\ No newline at end of file
+      - app/sdms/**/*
+      if: $FOSSA_API_KEY
\ No newline at end of file

app/sdms/devops/osdu/scanners/lint-node.yml

@@ -8,7 +8,7 @@ sdms_lint:
     - npm install -g typescript
     - npm install -g  tslint
     - npm run lint
-  only:
-    changes:
+  rules:
+    - changes:
       - devops/**/*
       - app/sdms/**/*
\ No newline at end of file

app/sdms/devops/osdu/scanners/scan-for-secrets-node.yml

@@ -8,7 +8,7 @@ sdms_scan-for-secrets:
   script:
     - cd app/$SDMS_SERVICE
     - detect-secrets-hook --exclude-files npm-shrinkwrap.json --exclude-files package.json --exclude-files devops/osdu/scanners/scan-for-secrets-node.yml --baseline devops/docker/detect_secrets/.secrets.baseline $(git ls-files)
-  only:
-    changes:
+  rules:
+    - changes:
       - devops/**/*
       - app/sdms/**/*
\ No newline at end of file