diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d301d39a7172eff7cfa3c20a354be0489731534..dee1449f90dab5feef929f89192320477542758c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,34 +22,40 @@ variables: include: - project: "osdu/platform/ci-cd-pipelines" file: "standard-setup.yml" + ref: release/0.25 - project: "osdu/platform/ci-cd-pipelines" file: "build/maven.yml" + ref: release/0.25 - project: "osdu/platform/ci-cd-pipelines" file: "scanners/fossa-maven.yml" + ref: release/0.25 - project: "osdu/platform/ci-cd-pipelines" file: "scanners/gitlab-ultimate.yml" + ref: release/0.25 - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/azure.yml" + ref: release/0.25 - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/gc-global.yml" + ref: release/0.25 - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/ibm.yml" + ref: release/0.25 # aws - local: "devops/aws/pipeline/override-stages.yml" - local: "devops/gc/pipeline/override-stages.yml" - .maven: image: maven:3.9.3-eclipse-temurin-17 - tags: ['osdu-medium'] + tags: [ 'osdu-medium' ] variables: MAVEN_REPO_PATH: "$CI_PROJECT_DIR/.m2/repository" MAVEN_CLI_OPTS: "--batch-mode --settings=$CI_PROJECT_DIR/.mvn/community-maven.settings.xml" @@ -159,7 +165,6 @@ azure_test: aws-test-java: image: $CI_REGISTRY/osdu/platform/deployment-and-operations/base-containers-aws/aws-maven/aws-maven:v2.1 - fossa-analyze: image: $CI_REGISTRY/divido/fossa-with-cache:v0.9-jdk17 fossa-check-notice: diff --git a/devops/aws/pipeline/override-stages.yml b/devops/aws/pipeline/override-stages.yml index bcdc513f7215810a1ea6971a20f7c36cfc8afb74..ae1f7d2110ff8a2df37718efab1201e4dccb6d04 100644 --- a/devops/aws/pipeline/override-stages.yml +++ b/devops/aws/pipeline/override-stages.yml @@ -15,12 +15,16 @@ include: - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/aws-global.yml" + ref: release/0.25 - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/aws-global-variables.yml" + ref: release/0.25 - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/aws-global.yml" + ref: release/0.25 - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/aws-maven.yml" + ref: release/0.25 aws-test-java: script: @@ -34,4 +38,3 @@ aws-test-java: - trap "python3 $PUSH_ENDPOINT_PATH/setup_teardown_endpoint.py --delete --environment_file $PUSH_ENDPOINT_PATH/environment_file.sh --kube_file $PUSH_ENDPOINT_PATH/push-endpoint-manifest.yaml" EXIT - source $PUSH_ENDPOINT_PATH/environment_file.sh - $MAVEN_BUILD $INTEGRATION_TEST_DIR maven-aws-integration-test-output.log ${AWS_MAVEN_TEST_COMMAND_OVERRIDE:-test} --update-snapshots -DdisableXmlReport=true -