Commit 9aca070d authored by Abhishek Kumar (SLB)'s avatar Abhishek Kumar (SLB)
Browse files

Merge remote-tracking branch 'origin/master' into Bug-9334

parents c1e6d262 8f090570
Pipeline #113844 failed with stages
in 34 seconds
......@@ -40,8 +40,9 @@ bootstrap_schema_gettoken_gcp() {
BEARER_TOKEN=$(gcloud auth print-identity-token --audiences="${AUDIENCES}")
export BEARER_TOKEN
echo "Clean-up for Datastore schemas"
python3 ./scripts/GcpDatastoreCleanUp.py
# FIXME CleanUP script needed only for TF installation
# echo "Clean-up for Datastore schemas"
# python3 ./scripts/GcpDatastoreCleanUp.py
# FIXME find a better solution about datastore cleaning completion
sleep 5
......
......@@ -21,8 +21,6 @@ variables:
--set data.bootstrap_image=$CI_REGISTRY_IMAGE/osdu-gcp-bootstrap-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA
--set data.bootstrapServiceAccountName=datafier-workload-identity-gke
$OSDU_GCP_HELM_TIMEOUT
# FIXME add value below for DEV2 pipeline
# OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2: >
osdu-gcp-containerize-bootstrap-gitlab:
variables:
......@@ -46,22 +44,12 @@ osdu-gcp-deploy-deployment:
- echo $STATUS
- if [[ "$STATUS" != *"met"* ]]; then echo "POD didn't start correctly" ; exit 1 ; fi
# REFACTOR to common pipeline for DEV2
# osdu-gcp-dev2-deploy-deployment:
# variables:
# OSDU_GCP_BOOTSTRAP_NAMESPACE: config
# OSDU_GCP_BOOTSTRAP_SERVICE_ACCOUNT: workload-gke-bootstrap-sa
# needs:
# - osdu-gcp-containerize-gitlab
# - osdu-gcp-deploy-configmap
# - osdu-gcp-containerize-bootstrap-schema
# after_script:
# - echo ----- Verify Bootstrap -----
# - kubectl rollout status deployment.v1.apps/$OSDU_GCP_SERVICE-bootstrap -n $OSDU_GCP_HELM_NAMESPACE --timeout=900s
# - POD=$(kubectl get pod --sort-by=.metadata.creationTimestamp -n $OSDU_GCP_HELM_NAMESPACE | grep $OSDU_GCP_SERVICE-bootstrap | tail -1 | awk '{print $1}')
# - STATUS=$(kubectl wait -n $OSDU_GCP_HELM_NAMESPACE --for=condition=Ready pod/$POD --timeout=300s)
# - echo $STATUS
# - if [[ "$STATUS" != *"met"* ]]; then echo "POD didn't start correctly" ; exit 1 ; fi
osdu-gcp-dev2-deploy-deployment:
needs:
- osdu-gcp-containerize-gitlab
- osdu-gcp-dev2-deploy-configmap
- osdu-gcp-containerize-bootstrap-gitlab
osdu-gcp-anthos-deploy-deployment:
needs:
......
......@@ -10,7 +10,7 @@
<artifactId>schema-test-core</artifactId>
<properties>
<os-core-lib-ibm.version>0.7.0</os-core-lib-ibm.version>
<os-core-lib-ibm.version>0.15.0-rc3</os-core-lib-ibm.version>
<os-core-lib-azure.version>0.6.1</os-core-lib-azure.version>
<os-core-lib-aws.version>0.13.0</os-core-lib-aws.version>
<maven.compiler.target>1.8</maven.compiler.target>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment