From c8147a06db37268e5222a644b58017738e806d11 Mon Sep 17 00:00:00 2001 From: Daniel Perez Date: Tue, 9 Aug 2022 05:45:48 +0000 Subject: [PATCH] ci: fix pipeline --- .../cloud-providers/aws-common-pipeline.yml | 10 ++++---- .../cloud-providers/azure-common-pipeline.yml | 23 +++++++++++++++---- .../cloud-providers/ibm-common-pipeline.yml | 8 +++---- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/devops/osdu/global/cloud-providers/aws-common-pipeline.yml b/devops/osdu/global/cloud-providers/aws-common-pipeline.yml index 6693a51..5e96a5a 100644 --- a/devops/osdu/global/cloud-providers/aws-common-pipeline.yml +++ b/devops/osdu/global/cloud-providers/aws-common-pipeline.yml @@ -57,7 +57,7 @@ aws-gen-token-test: - .token only: variables: - - $AWS_SKIP_DEPLOY != 'true' && $AWS == 'true' && $AWS_DEPLOY_TARGET == 'EKS' + - $AWS_SKIP_DEPLOY != 'true' && $AWS == '1' && $AWS_DEPLOY_TARGET == 'EKS' aws-prepare-test: image: $CI_REGISTRY/osdu/platform/deployment-and-operations/base-containers-aws/aws-node/aws-node:v1.0-node14 @@ -123,7 +123,7 @@ aws-prepare-test: - .token only: variables: - - $AWS_SKIP_DEPLOY != 'true' && $AWS == 'true' && $AWS_DEPLOY_TARGET == 'EKS' + - $AWS_SKIP_DEPLOY != 'true' && $AWS == '1' && $AWS_DEPLOY_TARGET == 'EKS' .aws-test: image: $CI_REGISTRY_IMAGE/sdapi-osdu-centos7-static-deps @@ -143,7 +143,7 @@ aws-prepare-test: - ./devops/scripts/run_regression_tests.sh --program=./build/bin/e2e/regression --service-url="${SEISMICSTORE_SVC_URL}" --service-key="NA" --idtoken="$svctoken" --tenant="${AWS_E2E_CPP_TENANT}" --subproject="${AWS_E2E_CPP_SUBPROJECT}" --legal-tag="${AWS_E2E_CPP_TENANT}-${AWS_E2E_CPP_LEGALTAG01}" only: variables: - - $AWS_SKIP_DEPLOY != 'true' && $AWS == 'true' && $AWS_DEPLOY_TARGET == 'EKS' + - $AWS_SKIP_DEPLOY != 'true' && $AWS == '1' && $AWS_DEPLOY_TARGET == 'EKS' .aws-sanitizer-test: tags: ["osdu-large"] @@ -164,7 +164,7 @@ aws-prepare-test: - ./devops/scripts/run_regression_tests.sh --program=./build/bin/e2e/regression --service-url="${SEISMICSTORE_SVC_URL}" --service-key="NA" --idtoken="$svctoken" --tenant="${AWS_E2E_CPP_TENANT}" --subproject="${AWS_E2E_CPP_SUBPROJECT}" --legal-tag="${AWS_E2E_CPP_TENANT}-${AWS_E2E_CPP_LEGALTAG01}" only: variables: - - $AWS_SKIP_DEPLOY != 'true' && $AWS == 'true' && $AWS_DEPLOY_TARGET == 'EKS' + - $AWS_SKIP_DEPLOY != 'true' && $AWS == '1' && $AWS_DEPLOY_TARGET == 'EKS' aws-clean-test: image: $CI_REGISTRY/osdu/platform/deployment-and-operations/base-containers-aws/aws-node/aws-node:v1.0-node14 @@ -201,4 +201,4 @@ aws-clean-test: - .token only: variables: - - $AWS_SKIP_DEPLOY != 'true' && $AWS == 'true' && $AWS_DEPLOY_TARGET == 'EKS' \ No newline at end of file + - $AWS_SKIP_DEPLOY != 'true' && $AWS == '1' && $AWS_DEPLOY_TARGET == 'EKS' \ No newline at end of file diff --git a/devops/osdu/global/cloud-providers/azure-common-pipeline.yml b/devops/osdu/global/cloud-providers/azure-common-pipeline.yml index 05f9bf8..261e56b 100644 --- a/devops/osdu/global/cloud-providers/azure-common-pipeline.yml +++ b/devops/osdu/global/cloud-providers/azure-common-pipeline.yml @@ -4,6 +4,13 @@ azure_containerize: echo 'empty' only: - $DISABLED == 'true' + +azure_containerize_helm: + needs: [] + script: + echo 'empty' + only: + - $DISABLED == 'true' container_scanning: needs: [] @@ -44,6 +51,14 @@ azure_test_py: only: - $DISABLED == 'true' +azure-publish: + needs: [] + script: + echo 'empty' + rules: + - if: $DISABLED == 'true' + when: never + azure-gen-token-test: tags: ["osdu-medium"] image: node @@ -62,7 +77,7 @@ azure-gen-token-test: - .token only: variables: - - $AZURE == 'true' + - $AZURE == '1' azure-curl-gen-token-test: tags: ["osdu-medium"] @@ -82,7 +97,7 @@ azure-curl-gen-token-test: - .token only: variables: - - $AZURE == 'true' + - $AZURE == '1' .azure_test: tags: ["osdu-large"] @@ -100,7 +115,7 @@ azure-curl-gen-token-test: - ./devops/scripts/run_regression_tests.sh --program=./build/bin/e2e/regression --service-url="https://${AZURE_DNS_NAME}${AZURE_SDMS_PREFIX}" --service-key="NA" --idtoken="$svctoken" --tenant="${E2E_TENANT}" --subproject="${E2E_SUBPROJECT}" --legal-tag="${E2E_LEGALTAG01}" only: variables: - - $AZURE == 'true' + - $AZURE == '1' .sanitizer-test: tags: ["osdu-large"] @@ -118,4 +133,4 @@ azure-curl-gen-token-test: - ./devops/scripts/run_regression_tests.sh --program=./build/bin/e2e/regression --service-url="https://${AZURE_DNS_NAME}${AZURE_SDMS_PREFIX}" --service-key="NA" --idtoken="$svctoken" --tenant="${E2E_TENANT}" --subproject="${E2E_SUBPROJECT}" --legal-tag="${E2E_LEGALTAG01}" only: variables: - - $AZURE == 'true' \ No newline at end of file + - $AZURE == '1' \ No newline at end of file diff --git a/devops/osdu/global/cloud-providers/ibm-common-pipeline.yml b/devops/osdu/global/cloud-providers/ibm-common-pipeline.yml index 787fd92..b93eadb 100644 --- a/devops/osdu/global/cloud-providers/ibm-common-pipeline.yml +++ b/devops/osdu/global/cloud-providers/ibm-common-pipeline.yml @@ -68,7 +68,7 @@ ibm-gen-token-test: - .token only: variables: - - $IBM == 'true' + - $IBM == '1' ibm-prepare-test: image: $CI_REGISTRY_IMAGE/sdapi-osdu-centos7-static-deps @@ -98,7 +98,7 @@ ibm-prepare-test: - .token only: variables: - - $IBM == 'true' + - $IBM == '1' .ibm-test: tags: ["osdu-medium"] @@ -118,7 +118,7 @@ ibm-prepare-test: - ./devops/scripts/run_regression_tests.sh --program=./build/bin/e2e/regression --service-url="https://${SEISMIC_HOST}/api/v3" --service-key="NA" --idtoken="$svctoken" --tenant="${IBM_TENANT_NAME}" --subproject="${E2E_IBM_SUBPROJECT}" --legal-tag="${E2E_IBM_LEGAL_TAG}" only: variables: - - $IBM == 'true' + - $IBM == '1' .ibm-sanitizer-test: tags: ["osdu-medium"] @@ -139,4 +139,4 @@ ibm-prepare-test: - ./devops/scripts/run_regression_tests.sh --program=./build/bin/e2e/regression --service-url="https://${SEISMIC_HOST}/api/v3" --service-key="NA" --idtoken="$svctoken" --tenant="${IBM_TENANT_NAME}" --subproject="${E2E_IBM_SUBPROJECT}" --legal-tag="${E2E_IBM_LEGAL_TAG}" only: variables: - - $IBM == 'true' \ No newline at end of file + - $IBM == '1' -- GitLab