diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3840a1f6b9ad80cfa7559d07be554668f604cdac..cf20fc1806be55d46706ccb2d7816c753d9ff6f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,27 +22,33 @@ variables: include: - project: "osdu/platform/ci-cd-pipelines" file: "standard-setup.yml" + ref: release/0.24 - project: "osdu/platform/ci-cd-pipelines" file: "build/maven.yml" + ref: release/0.24 - project: "osdu/platform/ci-cd-pipelines" file: "scanners/fossa-maven.yml" + ref: release/0.24 - project: "osdu/platform/ci-cd-pipelines" file: "scanners/gitlab-ultimate.yml" + ref: release/0.24 - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/azure.yml" + ref: release/0.24 - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/gc-global.yml" + ref: release/0.24 - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/ibm.yml" + ref: release/0.24 # aws - local: "devops/aws/pipeline/override-stages.yml" - local: "devops/gc/pipeline/override-stages.yml" - diff --git a/devops/aws/pipeline/override-stages.yml b/devops/aws/pipeline/override-stages.yml index 16fb9baf7e4788cbf4a6ad3f0d0cad54986633b0..fc61697ed660bd0c2bb0a1f6eb3238f951b351a8 100644 --- a/devops/aws/pipeline/override-stages.yml +++ b/devops/aws/pipeline/override-stages.yml @@ -1,12 +1,16 @@ include: - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/aws-global.yml" + ref: release/0.24 - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/aws-global-variables.yml" + ref: release/0.24 - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/aws-global.yml" + ref: release/0.24 - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/aws-maven.yml" + ref: release/0.24 aws-test-java: script: @@ -17,4 +21,3 @@ aws-test-java: - chmod 600 $KUBECONFIG - $MAVEN_BUILD $INTEGRATION_TEST_DIR maven-aws-integration-test-output.log ${AWS_MAVEN_TEST_COMMAND_OVERRIDE:-test} --update-snapshots -DdisableXmlReport=true -