diff options
| -rw-r--r-- | jjb/cps/cps.yaml | 1 | ||||
| -rw-r--r-- | jjb/global-defaults.yaml | 2 | ||||
| -rw-r--r-- | jjb/oom/oom-helm.yaml | 3 | ||||
| -rw-r--r-- | jjb/sdc/sdc-csit.yaml | 9 | ||||
| -rw-r--r-- | jjb/sdc/sdc.yaml | 2 |
5 files changed, 14 insertions, 3 deletions
diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml index 0e4baef01..fc79e96f4 100644 --- a/jjb/cps/cps.yaml +++ b/jjb/cps/cps.yaml @@ -43,7 +43,6 @@ sign-artifacts: true build-node: centos7-docker-8c-8g maven-versions-plugin: true - mvn-params: '-DprocessAllModules' - gerrit-maven-docker-stage: build-node: centos7-docker-8c-8g maven-versions-plugin: true diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml index 1dd35a8c2..e29f27883 100644 --- a/jjb/global-defaults.yaml +++ b/jjb/global-defaults.yaml @@ -59,7 +59,7 @@ # SonarCloud sonarcloud_project_organization: onap sonarcloud_api_token: da97604dfdc36ec82488a97ebea96ad01f7b10ff - sonar_mvn_goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar" + sonar_mvn_goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.8.0.2131:sonar" # Nexus3 docker registries container-public-registry: nexus3.onap.org:10001 diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml index eeeab1568..504f7f49a 100644 --- a/jjb/oom/oom-helm.yaml +++ b/jjb/oom/oom-helm.yaml @@ -63,6 +63,9 @@ - "{project-name}-{stream}-verify-helm2": files: "**" build-timeout: 360 + stream: + - guilin + - frankfurt - "{project-name}-{stream}-verify-{helm_bin}": build_script: "{oom_build_script}" files: "**" diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index 873c0a6c6..96f6625c1 100644 --- a/jjb/sdc/sdc-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -10,6 +10,15 @@ mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/ -Ddocker.skip.push=true -P docker,all-for-integration-tests-only' maven-versions-plugin: true build-concurrent: true + archive-artifacts: > + **/*.log + **/hs_err_*.log + **/target/**/feature.xml + **/target/failsafe-reports/failsafe-summary.xml + **/target/surefire-reports/*-output.txt + integration-tests/target/ExtentReport/API/*.html + integration-tests/target/ExtentReport/UI/*.html + integration-tests/target/ExtentReport/UI/screenshots/*.png - '{project-name}-merge-verification-maven-{stream}': build-node: ubuntu1804-docker-8c-16g container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 79c722400..de4ece0ab 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -94,7 +94,7 @@ sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-api-token: '{sonarcloud_api_token}' sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1804-docker-8c-16g project: 'sdc' |