diff --git a/app/sdms/devops/osdu/cloud-providers/aws.yml b/app/sdms/devops/osdu/cloud-providers/aws.yml index b5b9e152ac12a637a46520ff9308491052032b64..c9e682fa2eb482e7a2eab7940305e08c35d5b190 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 d8c73b56715609fc758851863cad034f7e72cfd3..9b7abba64ce4cb3b5dde129f83621f777556bbf5 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: diff --git a/app/sdms/src/cloud/providers/azure/credentials.ts b/app/sdms/src/cloud/providers/azure/credentials.ts index d28341b9c11fe78a4b377d957a511cabda11180e..5c9f5d44af8b46ad84680afcfd7eb6d3aff044d7 100644 --- a/app/sdms/src/cloud/providers/azure/credentials.ts +++ b/app/sdms/src/cloud/providers/azure/credentials.ts @@ -31,7 +31,7 @@ import {ExponentialRetryPolicyOptions} from '@azure/core-rest-pipeline' import { AccessToken, GetTokenOptions } from '@azure/core-auth'; const KExpiresMargin = 300; // 5 minutes -const UserDelegationKeyValidityInMinutes = 60 * 4; // 4 hours +const UserDelegationKeyValidityInMinutes = 3599; // expires at the same time as the sas token const ExpirationLeadInMinutes = 15; // expire 15 minutes before actual date const SasExpirationInMinutes = 3599; // shortly under 2.5 days @@ -238,4 +238,5 @@ class RetriableAzureCredential extends DefaultAzureCredential { .then(res => prom) .catch(err => this.retry(fn, retries - 1)) } -} \ No newline at end of file + +}