Commit f27f31f0 authored by Yunhua Koglin's avatar Yunhua Koglin
Browse files

Merge remote-tracking branch 'origin/dev' into aws-eks

parents a7426f15 3bd11071
Pipeline #61226 failed with stages
in 22 minutes and 45 seconds
...@@ -12,6 +12,8 @@ variables: ...@@ -12,6 +12,8 @@ variables:
AWS_TEST_SUBDIR: testing/notification-test-aws AWS_TEST_SUBDIR: testing/notification-test-aws
AWS_SERVICE: notification AWS_SERVICE: notification
AWS_ENVIRONMENT: dev AWS_ENVIRONMENT: dev
AWS_DEPLOY_TARGET: EKS
AWS_EKS_DEPLOYMENT_NAME: os-notification
AZURE_SERVICE: notification AZURE_SERVICE: notification
AZURE_BUILD_SUBDIR: provider/notification-azure AZURE_BUILD_SUBDIR: provider/notification-azure
......
...@@ -21,6 +21,11 @@ env: ...@@ -21,6 +21,11 @@ env:
secrets-manager: secrets-manager:
DOCKER_USERNAME: /osdu/devops/docker_credentials:username DOCKER_USERNAME: /osdu/devops/docker_credentials:username
DOCKER_PASSWORD: /osdu/devops/docker_credentials:password DOCKER_PASSWORD: /osdu/devops/docker_credentials:password
SONAR_USERNAME: /osdu/devops/sonar_credentials:username
SONAR_PASSWORD: /osdu/devops/sonar_credentials:password
parameter-store:
SONAR_URL: /osdu/devops/sonar_url
phases: phases:
install: install:
...@@ -58,7 +63,7 @@ phases: ...@@ -58,7 +63,7 @@ phases:
- printenv - printenv
- echo "Building primary service assemblies..." - echo "Building primary service assemblies..."
- mvn -ntp -B test install -pl notification-core,provider/notification-aws -Ddeployment.environment=prod - mvn -ntp -B test install sonar:sonar -pl .,notification-core,provider/notification-aws -Ddeployment.environment=prod -Dsonar.login=${SONAR_USERNAME} -Dsonar.password=${SONAR_PASSWORD} -Dsonar.branch.name=${BRANCH_NAME}
- 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
...@@ -78,6 +83,9 @@ phases: ...@@ -78,6 +83,9 @@ phases:
python provider/notification-aws/build-aws/build-info.py --branch ${CODEBUILD_SOURCE_VERSION} --commit ${CODEBUILD_RESOLVED_SOURCE_VERSION} \ python provider/notification-aws/build-aws/build-info.py --branch ${CODEBUILD_SOURCE_VERSION} --commit ${CODEBUILD_RESOLVED_SOURCE_VERSION} \
--buildid ${CODEBUILD_BUILD_ID} --buildnumber ${CODEBUILD_BUILD_NUMBER} --reponame ${REPO_NAME} --outdir ${OUTPUT_DIR} \ --buildid ${CODEBUILD_BUILD_ID} --buildnumber ${CODEBUILD_BUILD_NUMBER} --reponame ${REPO_NAME} --outdir ${OUTPUT_DIR} \
--artifact ${ECR_IMAGE} --artifact ${ECR_IMAGE}
post_build:
commands:
- cp provider/notification-aws/target/dependency-check-report.html ${OUTPUT_DIR}
reports: reports:
SurefireReports: # CodeBuild will create a report group called "SurefireReports". SurefireReports: # CodeBuild will create a report group called "SurefireReports".
files: #Store all of the files files: #Store all of the files
......
...@@ -54,6 +54,17 @@ limitations under the License. ...@@ -54,6 +54,17 @@ limitations under the License.
<azure.devops.token>no-default</azure.devops.token> <azure.devops.token>no-default</azure.devops.token>
</properties> </properties>
</profile> </profile>
<profile>
<id>sonar</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<sonar.host.url>
${env.SONAR_URL}
</sonar.host.url>
</properties>
</profile>
</profiles> </profiles>
<servers> <servers>
......
...@@ -116,6 +116,18 @@ ...@@ -116,6 +116,18 @@
<failOnMissingWebXml>false</failOnMissingWebXml> <failOnMissingWebXml>false</failOnMissingWebXml>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>6.2.2</version>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment