diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9d280ff22abe139564537ffe29f29cd7aca21a72..ac34efb16dd311a99700eaa875e030a8b3770cf9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,39 +6,53 @@ variables: GCP_BUILD_SUBDIR: provider/legal-gcp GCP_INT_TEST_SUBDIR: testing/legal-test-gcp - GCP_APPLICATION_NAME: os-legal GCP_ENVIRONMENT: testing GCP_PROJECT: opendes-evt GCP_TENANT_NAME: opendes-evt + OSDU_GCP_BUILD_SUBDIR: provider/legal-gcp + OSDU_GCP_INT_TEST_SUBDIR: testing/legal-test-gcp + OSDU_GCP_APPLICATION_NAME: os-legal + + IBM_BUILD_SUBDIR: provider/legal-ibm + IBM_INT_TEST_SUBDIR: testing/legal-test-ibm + AZURE_SERVICE: legal AZURE_BUILD_SUBDIR: provider/legal-azure AZURE_TEST_SUBDIR: testing/legal-test-azure - IBM_BUILD_SUBDIR: provider/legal-ibm - IBM_INT_TEST_SUBDIR: testing/legal-test-ibm include: - project: "osdu/platform/ci-cd-pipelines" file: "standard-setup.yml" + - project: "osdu/platform/ci-cd-pipelines" file: "build/maven.yml" - - project: 'osdu/platform/ci-cd-pipelines' - ref: "master" - file: "cloud-providers/azure.yml" - - project: 'osdu/platform/ci-cd-pipelines' - ref: "master" - file: 'cloud-providers/gcp.yml' - - project: 'osdu/platform/ci-cd-pipelines' - file: 'cloud-providers/aws.yml' - - project: 'osdu/platform/ci-cd-pipelines' - file: 'cloud-providers/ibm.yml' + - project: "osdu/platform/ci-cd-pipelines" file: "scanners/fossa.yml" + - project: "osdu/platform/ci-cd-pipelines" file: "scanners/gitlab-ultimate.yml" + - project: "osdu/platform/ci-cd-pipelines" + file: "cloud-providers/aws.yml" + + - project: "osdu/platform/ci-cd-pipelines" + file: "cloud-providers/ibm.yml" + + - project: "osdu/platform/ci-cd-pipelines" + file: "cloud-providers/azure.yml" + + - project: 'osdu/platform/ci-cd-pipelines' + ref: "WIP-MR-Legal-CICD" + file: 'cloud-providers/osdu-gcp.yml' + + - project: 'osdu/platform/ci-cd-pipelines' + ref: "master" + file: 'cloud-providers/gcp.yml' + compile-and-unit-test: variables: - GOOGLE_CLOUD_PROJECT: opendes-evt + GOOGLE_CLOUD_PROJECT: opendes-evt \ No newline at end of file