Commit 641465d0 authored by Abhishek Kumar (SLB)'s avatar Abhishek Kumar (SLB)
Browse files

Merge branch 'master' into Bug-9334

parents 83902f67 5328dc1a
Pipeline #116224 failed
......@@ -23,7 +23,6 @@ source ./validate-env.sh "SCHEMA_URL"
source ./validate-env.sh "ENTITLEMENTS_HOST"
bootstrap_schema_gettoken_onprem() {
echo "Waiting for a sidecar container is provisioned"
ID_TOKEN="$(curl --location --request POST "${OPENID_PROVIDER_URL}/protocol/openid-connect/token" \
--header "Content-Type: application/x-www-form-urlencoded" \
......@@ -35,7 +34,6 @@ bootstrap_schema_gettoken_onprem() {
}
bootstrap_schema_gettoken_gcp() {
echo "Waiting for a sidecar container is provisioned"
BEARER_TOKEN=$(gcloud auth print-identity-token --audiences="${AUDIENCES}")
export BEARER_TOKEN
......@@ -45,12 +43,12 @@ bootstrap_schema_gettoken_gcp() {
# python3 ./scripts/GcpDatastoreCleanUp.py
# FIXME find a better solution about datastore cleaning completion
sleep 5
# sleep 5
}
bootstrap_schema_prechek_env() {
status_code=$(curl --retry 1 --location -globoff --request POST \
"${ENTITLEMENTS_HOST}/api/entitlements/v2/tenant-provisioning" \
status_code=$(curl --retry 1 --location -globoff --request GET \
"${ENTITLEMENTS_HOST}/api/entitlements/v2/groups" \
--write-out "%{http_code}" --silent --output "/dev/null"\
--header 'Content-Type: application/json' \
--header "data-partition-id: ${DATA_PARTITION}" \
......@@ -60,7 +58,7 @@ bootstrap_schema_prechek_env() {
then
echo "$status_code: Entitlements provisioning completed successfully!"
else
echo "$status_code: Entitlements provisioning failed!"
echo "$status_code: Entitlements provisioning is in progress or failed!"
exit 1
fi
}
......
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