Skip to content
Snippets Groups Projects
Commit f70f68f3 authored by Rustam Lotsmanenko (EPAM)'s avatar Rustam Lotsmanenko (EPAM)
Browse files

Merge branch 'faid/partitionTransitionSinglePipeline' into 'master'

Gradual transition to one CI pipeline for Partition

See merge request !656
parents 686537f6 2597740e
No related branches found
No related tags found
1 merge request!656Gradual transition to one CI pipeline for Partition
Pipeline #311168 failed
...@@ -50,11 +50,23 @@ include: ...@@ -50,11 +50,23 @@ include:
- project: "osdu/platform/ci-cd-pipelines" - project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/gc-global.yml" file: "cloud-providers/gc-global.yml"
- local: "devops/gc/pipeline/override-stages.yml"
- project: "osdu/platform/ci-cd-pipelines" - project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/core-global.yml" file: "cloud-providers/core-global.yml"
- project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/aws-one-pipeline.yml"
- project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/azure-one-pipeline.yml"
- project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/gc-one-pipeline.yml"
- project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/ibm-one-pipeline.yml"
- local: "devops/gc/pipeline/override-stages.yml"
- local: "devops/core-plus/pipeline/override-stages.yml" - local: "devops/core-plus/pipeline/override-stages.yml"
- local: "/publish.yml" - local: "/publish.yml"
......
...@@ -23,10 +23,10 @@ download_gc_plugins: ...@@ -23,10 +23,10 @@ download_gc_plugins:
- $GC == '1' - $GC == '1'
gc-containerize-gitlab: gc-containerize-gitlab:
needs: ["compile-and-unit-test", "download_gc_plugins"] needs: ["gc-compile-and-unit-test", "download_gc_plugins"]
gc-containerize-gcr: gc-containerize-gcr:
needs: ["compile-and-unit-test", "download_gc_plugins"] needs: ["gc-compile-and-unit-test", "download_gc_plugins"]
gc-deploy: # reuse common deploy job for test deployment gc-deploy: # reuse common deploy job for test deployment
variables: variables:
......
...@@ -22,15 +22,6 @@ ...@@ -22,15 +22,6 @@
<description>Partition Service</description> <description>Partition Service</description>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules>
<module>partition-core</module>
<module>provider/partition-azure</module>
<module>provider/partition-aws</module>
<module>provider/partition-ibm</module>
<module>provider/partition-gc</module>
<module>partition-core-plus</module>
</modules>
<properties> <properties>
<java.version>17</java.version> <java.version>17</java.version>
<maven.compiler.target>17</maven.compiler.target> <maven.compiler.target>17</maven.compiler.target>
...@@ -203,6 +194,40 @@ ...@@ -203,6 +194,40 @@
<publish.releases.url>https://community.opengroup.org/api/v4/projects/221/packages/maven</publish.releases.url> <publish.releases.url>https://community.opengroup.org/api/v4/projects/221/packages/maven</publish.releases.url>
</properties> </properties>
</profile> </profile>
<profile>
<id>core</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>partition-core</module>
<module>partition-core-plus</module>
</modules>
</profile>
<profile>
<id>aws</id>
<modules>
<module>provider/partition-aws</module>
</modules>
</profile>
<profile>
<id>azure</id>
<modules>
<module>provider/partition-azure</module>
</modules>
</profile>
<profile>
<id>ibm</id>
<modules>
<module>provider/partition-ibm</module>
</modules>
</profile>
<profile>
<id>gc</id>
<modules>
<module>provider/partition-gc</module>
</modules>
</profile>
</profiles> </profiles>
<repositories> <repositories>
......
...@@ -66,8 +66,8 @@ phases: ...@@ -66,8 +66,8 @@ phases:
- if [ "$GIT_SECRETS_SCAN_RESULT" = "FAILED" ]; then echo "Secrets detected!" && exit 1; fi - if [ "$GIT_SECRETS_SCAN_RESULT" = "FAILED" ]; then echo "Secrets detected!" && exit 1; fi
- echo "Building primary service assemblies..." - echo "Building primary service assemblies..."
- mvn -ntp -B test install -pl .,partition-core,provider/partition-aws -Ddeployment.environment=prod - mvn -ntp -B test install -pl .,partition-core,provider/partition-aws -P core, aws -Ddeployment.environment=prod
- mvn sonar:sonar -pl .,provider/partition-aws -Dsonar.login=${SONAR_USERNAME} -Dsonar.password=${SONAR_PASSWORD} -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.host.url=${SONAR_URL} - mvn sonar:sonar -pl .,provider/partition-aws -P aws -Dsonar.login=${SONAR_USERNAME} -Dsonar.password=${SONAR_PASSWORD} -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.host.url=${SONAR_URL}
- echo "Building integration testing assemblies and gathering artifacts..." - echo "Building integration testing assemblies and gathering artifacts..."
- ./testing/partition-test-aws/build-aws/prepare-dist.sh - ./testing/partition-test-aws/build-aws/prepare-dist.sh
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment