Create Release Branch for version 0.28

.gitlab-ci.yml

@@ -17,11 +17,13 @@ include:
   # Every project should use this, it establishes the trusted MR pattern and the standard stages
   - project: "osdu/platform/ci-cd-pipelines"
     file: "standard-setup.yml"
+    ref: release/0.28
 
   # scan
   ## security scanners
   - project: "osdu/platform/ci-cd-pipelines"
     file: "scanners/gitlab-ultimate.yml"
+    ref: release/0.28
 
   # Scala Build
   - local: "devops/osdu/build/scala-build.yml"
@@ -29,6 +31,7 @@ include:
   # The FOSSA license scanner logic, which has to language specific
   - project: "osdu/platform/ci-cd-pipelines"
     file: "scanners/fossa-scala.yml"
+    ref: release/0.28
 
   # Azure deploy Glab
   - local: "devops/azure/azure.gitlab-ci.yml"
@@ -38,4 +41,3 @@ include:
 
   # publish documentations
   - local: "publish.yml"
-

devops/azure/azure.gitlab-ci.yml

@@ -8,6 +8,7 @@ variables:
 include:
   - project: "osdu/platform/ci-cd-pipelines"
     file: "cloud-providers/azure.yml"
+    ref: release/0.28
 
 azure_test:
   only:
@@ -34,12 +35,7 @@ azure_containerize:
     - echo "Custom azure_containerize"
     - cd build
     - >
-      docker build
-      --build-arg groupId="$VERSION_INFO_GROUP_ID" --build-arg artifactId="$VERSION_INFO_ARTIFACT_ID_AZURE"
-      --build-arg version="$VERSION_INFO_VERSION" --build-arg buildTime="$CI_PIPELINE_CREATED_AT"
-      --build-arg branch="$CI_COMMIT_BRANCH" --build-arg commitId="$CI_COMMIT_SHA"
-      --build-arg commitMessage="$CI_COMMIT_MESSAGE"
-      -t $CI_REGISTRY_IMAGE/$SHA_IMAGE -f Dockerfile .
+      docker build --build-arg groupId="$VERSION_INFO_GROUP_ID" --build-arg artifactId="$VERSION_INFO_ARTIFACT_ID_AZURE" --build-arg version="$VERSION_INFO_VERSION" --build-arg buildTime="$CI_PIPELINE_CREATED_AT" --build-arg branch="$CI_COMMIT_BRANCH" --build-arg commitId="$CI_COMMIT_SHA" --build-arg commitMessage="$CI_COMMIT_MESSAGE" -t $CI_REGISTRY_IMAGE/$SHA_IMAGE -f Dockerfile .
     - docker push ${CI_REGISTRY_IMAGE}/$SHA_IMAGE
     - docker tag $CI_REGISTRY_IMAGE/$SHA_IMAGE $CI_REGISTRY_IMAGE/$LATEST_IMAGE
     - docker push ${CI_REGISTRY_IMAGE}/$LATEST_IMAGE
@@ -88,18 +84,7 @@ azure_deploy:
     - ENV_VAULT=$(kubectl get cm -n osdu osdu-svc-config -o jsonpath={.data.ENV_KEYVAULT} | sed -e 's/https:\/\///;s/.vault.azure.*//')
     - kubectl delete deploy -l app=$CI_PROJECT_NAME -n ddms-production
     - >-
-      helm --debug upgrade -i $CI_PROJECT_NAME $HELM_CHART_OCI --version $HELM_CHART_OCI_VERSION -n ddms-production --wait --timeout 10m
-      -f devops/azure/pddms-timeseries-ingestion.values.yaml
-      --set azure.tenant=$AZURE_TENANT_ID
-      --set azure.subscription=$AZURE_SUBSCRIPTION_ID
-      --set azure.resourcegroup=$(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/base-name-cr --query value -otsv)-rg
-      --set azure.identity=$(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/base-name-cr --query value -otsv)-osdu-identity
-      --set azure.identity_id=$(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/osdu-identity-id --query value -otsv)
-      --set azure.keyvault.name=$ENV_VAULT
-      --set azure.acr=${AZURE_REGISTRY}.azurecr.io
-      --set configuration[0].container.image=${CI_PROJECT_NAME}-${CI_COMMIT_REF_SLUG}
-      --set configuration[0].container.tag=${CI_COMMIT_SHA}
-      --set ingress.dns=$AZURE_DNS_NAME
+      helm --debug upgrade -i $CI_PROJECT_NAME $HELM_CHART_OCI --version $HELM_CHART_OCI_VERSION -n ddms-production --wait --timeout 10m -f devops/azure/pddms-timeseries-ingestion.values.yaml --set azure.tenant=$AZURE_TENANT_ID --set azure.subscription=$AZURE_SUBSCRIPTION_ID --set azure.resourcegroup=$(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/base-name-cr --query value -otsv)-rg --set azure.identity=$(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/base-name-cr --query value -otsv)-osdu-identity --set azure.identity_id=$(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/osdu-identity-id --query value -otsv) --set azure.keyvault.name=$ENV_VAULT --set azure.acr=${AZURE_REGISTRY}.azurecr.io --set configuration[0].container.image=${CI_PROJECT_NAME}-${CI_COMMIT_REF_SLUG} --set configuration[0].container.tag=${CI_COMMIT_SHA} --set ingress.dns=$AZURE_DNS_NAME
     - POD_SERVICE_NAME=$(echo ${CI_PROJECT_NAME} |  sed -e "s/\(-\)\?service\(s\)\?//")
     - pod=$(kubectl get pod -n ddms-production|grep $POD_SERVICE_NAME |tail -1 |awk '{print $1}') || echo "[WARN] Not able to get pod but helm upgrade was successful"
     - status=$(kubectl wait -n ddms-production --for=condition=Ready pod/$pod --timeout=300s)
@@ -159,4 +144,4 @@ container_scanning:
     - if: $CI_COMMIT_BRANCH =~ /^release\//
       when: on_success
     - if: $CI_COMMIT_TAG
-      when: on_success
\ No newline at end of file
+      when: on_success

devops/osdu/build/scala-build.yml

@@ -2,7 +2,8 @@ include:
   # Here's your scala build logic
   - project: "osdu/platform/ci-cd-pipelines"
     file: "build/scala-build.yml"
+    ref: release/0.28
 
 .scala:
   image: sbtscala/scala-sbt:eclipse-temurin-alpine-17.0.10_7_1.10.0_3.4.2
-  tags: ['osdu-medium']
\ No newline at end of file
+  tags: [ 'osdu-medium' ]