Skip to content
Snippets Groups Projects
Commit 0806ef12 authored by Faid Luqman's avatar Faid Luqman Committed by Marc Burnie [AWS]
Browse files

Gradual transition to one CI pipeline

(cherry picked from commit a277c380)
parent 6578f9a6
No related branches found
No related tags found
1 merge request!569Cherry-pick 'Gradual transition to one CI pipeline for Notification' into release/0.28
...@@ -54,8 +54,8 @@ include: ...@@ -54,8 +54,8 @@ include:
file: "cloud-providers/core-global.yml" file: "cloud-providers/core-global.yml"
ref: release/0.28 ref: release/0.28
# aws - project: "osdu/platform/ci-cd-pipelines"
- local: "devops/aws/pipeline/override-stages.yml" file: "cloud-providers/aws-one-pipeline.yml"
- local: "devops/gc/pipeline/override-stages.yml" - local: "devops/gc/pipeline/override-stages.yml"
......
...@@ -23,7 +23,7 @@ download_gc_plugins: ...@@ -23,7 +23,7 @@ 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: ["gc-compile-and-unit-test", "download_gc_plugins"] needs: ["gc-compile-and-unit-test", "download_gc_plugins"]
......
...@@ -168,15 +168,6 @@ ...@@ -168,15 +168,6 @@
</dependency> </dependency>
</dependencies> </dependencies>
<modules>
<module>notification-core</module>
<module>provider/notification-gc</module>
<module>provider/notification-azure</module>
<module>provider/notification-ibm</module>
<module>provider/notification-aws</module>
<module>notification-core-plus</module>
</modules>
<repositories> <repositories>
<repository> <repository>
<id>${repo.releases.id}</id> <id>${repo.releases.id}</id>
...@@ -195,25 +186,6 @@ ...@@ -195,25 +186,6 @@
</snapshotRepository> </snapshotRepository>
</distributionManagement> </distributionManagement>
<profiles>
<profile>
<id>Default</id>
<activation>
<property>
<name>!repo.releases.id</name>
</property>
</activation>
<properties>
<repo.releases.id>community-maven-repo</repo.releases.id>
<publish.snapshots.id>community-maven-via-job-token</publish.snapshots.id>
<publish.releases.id>community-maven-via-job-token</publish.releases.id>
<repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/143/packages/maven</publish.snapshots.url>
<publish.releases.url>https://community.opengroup.org/api/v4/projects/143/packages/maven</publish.releases.url>
</properties>
</profile>
</profiles>
<build> <build>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
...@@ -255,4 +227,42 @@ ...@@ -255,4 +227,42 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>core</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>notification-core</module>
<module>notification-core-plus</module>
</modules>
</profile>
<profile>
<id>aws</id>
<modules>
<module>provider/notification-aws</module>
</modules>
</profile>
<profile>
<id>azure</id>
<modules>
<module>provider/notification-azure</module>
</modules>
</profile>
<profile>
<id>ibm</id>
<modules>
<module>provider/notification-ibm</module>
</modules>
</profile>
<profile>
<id>gc</id>
<modules>
<module>provider/notification-gc</module>
</modules>
</profile>
</profiles>
</project> </project>
...@@ -69,8 +69,8 @@ phases: ...@@ -69,8 +69,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 --no-transfer-progress -ntp -B test install -pl .,notification-core,provider/notification-aws -Ddeployment.environment=prod - mvn --no-transfer-progress -ntp -B test install -pl .,notification-core,provider/notification-aws -P core, aws -Ddeployment.environment=prod
- mvn --no-transfer-progress sonar:sonar -pl .,provider/notification-aws -Dsonar.scm.provider=git -Dsonar.login=${SONAR_USERNAME} -Dsonar.password=${SONAR_PASSWORD} -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.host.url=${SONAR_URL} - mvn --no-transfer-progress sonar:sonar -pl .,provider/notification-aws -P aws -Dsonar.scm.provider=git -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/notification-test-aws/build-aws/prepare-dist.sh - ./testing/notification-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