Merge branch 'faid/transitionSinglePipeline' into 'master'

Gradual transition to one CI pipeline for Notification

See merge request !560

.gitlab-ci.yml

@@ -46,6 +46,18 @@ include:
     - project: "osdu/platform/ci-cd-pipelines"
       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"
+
     # aws
     - local: "devops/aws/pipeline/override-stages.yml"
 

devops/aws/pipeline/override-stages.yml

@@ -28,7 +28,7 @@ aws-containerize:
     - .aws_common_variables
     - .aws_variables
   stage: containerize
-  needs: ['compile-and-unit-test']
+  needs: ['aws-compile-and-unit-test']
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - $(aws ecr get-login --no-include-email --region $AWS_ECR_REGION)

devops/gc/pipeline/override-stages.yml

@@ -23,7 +23,7 @@ download_gc_plugins:
       - $GC == '1'
 
 gc-containerize-gitlab:
-  needs: ["compile-and-unit-test", "download_gc_plugins"]
+  needs: ["gc-compile-and-unit-test", "download_gc_plugins"]
 
 gc-test:
   variables:

pom.xml

@@ -168,15 +168,6 @@
 		</dependency>	
 	</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>
 		<repository>
 			<id>${repo.releases.id}</id>
@@ -195,25 +186,6 @@
 		</snapshotRepository>
 	</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>
 		<pluginManagement>
 			<plugins>
@@ -255,4 +227,58 @@
 			</plugin>
 		</plugins>
 	</build>
+
+	<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>
+		<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>

provider/notification-aws/build-aws/buildspec.yaml

@@ -69,8 +69,8 @@ phases:
       - if [ "$GIT_SECRETS_SCAN_RESULT" = "FAILED" ]; then echo "Secrets detected!" && exit 1; fi
 
       - 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 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 -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 -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..."
       - ./testing/notification-test-aws/build-aws/prepare-dist.sh