diff options
Diffstat (limited to 'jjb/aaf')
| -rw-r--r-- | jjb/aaf/aaf-authz.yaml | 11 | ||||
| -rw-r--r-- | jjb/aaf/aaf-cadi.yaml | 13 | ||||
| -rw-r--r-- | jjb/aaf/aaf-certservice-csit.yaml | 3 | ||||
| -rw-r--r-- | jjb/aaf/aaf-certservice.yaml | 10 | ||||
| -rw-r--r-- | jjb/aaf/aaf-luaplugin.yaml | 1 | ||||
| -rw-r--r-- | jjb/aaf/aaf-sms.yaml | 7 | ||||
| -rw-r--r-- | jjb/aaf/aaf-sshsm.yaml | 3 |
7 files changed, 33 insertions, 15 deletions
diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml index c94118e6b..5e4dab4ab 100644 --- a/jjb/aaf/aaf-authz.yaml +++ b/jjb/aaf/aaf-authz.yaml @@ -5,6 +5,7 @@ views: - project-view +# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed - project: name: aaf-authz project-name: 'aaf-authz' @@ -19,7 +20,7 @@ build-node: centos7-docker-8c-8g - gerrit-maven-docker-stage: mvn-params: '-Dmaven.test.skip install exec:exec -Pbuild-docker' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' # LF said on 2019-08-01 that this was deprecated @@ -28,11 +29,13 @@ # settings: '{mvn-settings}' # script: # !include-raw-escape: 'build-aaf-docker-image.sh' -# build-node: 'ubuntu1604-docker-8c-8g' +# build-node: ubuntu1804-docker-8c-8g' project: 'aaf/authz' stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'aaf-authz-settings' files: '**' archive-artifacts: '' @@ -47,7 +50,7 @@ # settings: '{mvn-settings}' # script: # !include-raw-escape: 'build-aaf-docker-image.sh' -# build-node: 'ubuntu1804-docker-arm64-4c-2g' +# build-node: ubuntu1804-docker-arm64-4c-2g' # project: 'aaf/authz' # stream: # - 'master': @@ -66,7 +69,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aaf/authz' project-name: 'aaf-authz' branch: 'master' diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml index 65fb395c5..64b3bc3b9 100644 --- a/jjb/aaf/aaf-cadi.yaml +++ b/jjb/aaf/aaf-cadi.yaml @@ -1,4 +1,5 @@ --- +# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed - project: name: aaf-cadi project-name: 'aaf-cadi' @@ -27,7 +28,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aaf/cadi' project-name: 'aaf-cadi-shiro' branch: 'master' @@ -43,7 +44,7 @@ - '{project-name}-{stream}-aai-docker-java-daily': pom: 'sidecar/fproxy/pom.xml' mvn-goals: 'docker:build' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project: 'aaf/cadi' docker-image-name: 'onap/fproxy' stream: @@ -63,7 +64,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aaf/cadi' project-name: 'aaf-cadi-fproxy' branch: 'master' @@ -79,7 +80,7 @@ - '{project-name}-{stream}-aai-docker-java-daily': pom: 'sidecar/rproxy/pom.xml' mvn-goals: 'docker:build' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project: 'aaf/cadi' docker-image-name: 'onap/rproxy' stream: @@ -99,7 +100,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aaf/cadi' project-name: 'aaf-cadi-rproxy' branch: 'master' @@ -115,7 +116,7 @@ - '{project-name}-{stream}-aai-docker-java-daily': pom: 'sidecar/tproxy-config/pom.xml' mvn-goals: 'docker:build' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project: 'aaf/cadi' docker-image-name: 'onap/tproxy-config' stream: diff --git a/jjb/aaf/aaf-certservice-csit.yaml b/jjb/aaf/aaf-certservice-csit.yaml index 68077b7b7..990545bb2 100644 --- a/jjb/aaf/aaf-certservice-csit.yaml +++ b/jjb/aaf/aaf-certservice-csit.yaml @@ -1,3 +1,4 @@ +# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed - project: name: aaf-certservice-csit jobs: @@ -7,6 +8,8 @@ stream: - "master": branch: "master" + - "frankfurt": + branch: "frankfurt" functionality: - "certservice": trigger_jobs: diff --git a/jjb/aaf/aaf-certservice.yaml b/jjb/aaf/aaf-certservice.yaml index 8efdb438f..0fb6892e8 100644 --- a/jjb/aaf/aaf-certservice.yaml +++ b/jjb/aaf/aaf-certservice.yaml @@ -1,4 +1,5 @@ --- +# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed - project: name: aaf-certservice project-name: 'aaf-certservice' @@ -6,13 +7,16 @@ - 'master': branch: 'master' java-version: openjdk11 + - 'frankfurt': + branch: 'frankfurt' + java-version: openjdk11 project: 'aaf/certservice' mvn-settings: 'aaf-certservice-settings' files: '**' maven-deploy-properties: | deployAtEnd=true archive-artifacts: '' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g jobs: - '{project-name}-{stream}-verify-java': mvn-goals: 'clean install' @@ -26,7 +30,7 @@ maven-versions-plugin: true mvn-goals: 'clean deploy -P docker' - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-P docker -DskipTests=true -DskipNexusStagingDeployMojo=true -DskipDockerPush=false' @@ -44,7 +48,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project: 'aaf/certservice' project-name: 'aaf-certservice' branch: 'master' diff --git a/jjb/aaf/aaf-luaplugin.yaml b/jjb/aaf/aaf-luaplugin.yaml index 20bf1c811..8d65de839 100644 --- a/jjb/aaf/aaf-luaplugin.yaml +++ b/jjb/aaf/aaf-luaplugin.yaml @@ -1,4 +1,5 @@ --- +# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed - project: name: aaf-luaplugin-clm project-name: 'aaf-luaplugin' diff --git a/jjb/aaf/aaf-sms.yaml b/jjb/aaf/aaf-sms.yaml index a69daafa9..599754303 100644 --- a/jjb/aaf/aaf-sms.yaml +++ b/jjb/aaf/aaf-sms.yaml @@ -1,4 +1,5 @@ --- +# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed - project: name: aaf-sms project-name: 'aaf-sms' @@ -6,6 +7,8 @@ path: 'sms-service/src' golangver: 'golang111' jobs: + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g - '{project-name}-{stream}-verify-golang' - '{project-name}-{stream}-merge-golang' - gerrit-maven-stage: @@ -21,10 +24,12 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'aaf-sms-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: aaf-sms-info diff --git a/jjb/aaf/aaf-sshsm.yaml b/jjb/aaf/aaf-sshsm.yaml index 1178902bc..b3a45fbf4 100644 --- a/jjb/aaf/aaf-sshsm.yaml +++ b/jjb/aaf/aaf-sshsm.yaml @@ -1,4 +1,5 @@ --- +# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed - project: name: aaf-sshsm project-name: 'aaf-sshsm' @@ -18,7 +19,7 @@ mvn-settings: 'aaf-sshsm-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: aaf-sshsm-info |