Code Review / ci-management.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw (from parent 2: 4e2a3e8)
Merge "Removed warning message from Ansible"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Thu, 26 Mar 2020 15:43:13 +0000 (15:43 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 26 Mar 2020 15:43:13 +0000 (15:43 +0000)
jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml patch | blob | history
jjb/policy/policy-apex-pdp.yaml patch | blob | history
jjb/policy/policy-distribution.yaml patch | blob | history
jjb/policy/policy-docker-base-common.yaml patch | blob | history
jjb/policy/policy-drools-applications.yaml patch | blob | history
jjb/policy/policy-drools-pdp.yaml patch | blob | history
jjb/policy/policy-engine.yaml patch | blob | history
jjb/policy/policy-gui.yaml patch | blob | history
jjb/so/so.yaml patch | blob | history
jjb/usecases/usecases-csit.yaml [moved from jjb/usecases/config-over-netconf.yaml with 82% similarity] patch | blob | history

diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
index be95546..1c2dd59 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
@@ -57,7 +57,16 @@
           stream: master
           branch: 'master'
       - gerrit-docker-verify
-      - gerrit-docker-merge
+      - gerrit-docker-merge:
+          post_docker_build_script: |
+              #!/bin/bash
+              set -uex -o pipefail
+              DOCKER_IMAGE_TAG2=${{DOCKER_IMAGE_TAG%-*}}
+              DNAME={container-snapshot-registry}/{docker-name}
+              docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2
+              docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:latest
+              docker push $DNAME:$DOCKER_IMAGE_TAG2
+              docker push $DNAME:latest
       - gerrit-whitesource-scan:
           build-timeout: 120
           submodule-timeout: 30
diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 1923c76..42cfd7c 100644 (file)
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -19,9 +19,9 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker'
+          mvn-params: '-P docker maven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
@@ -35,7 +35,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: policy-apex-pdp-sonar
@@ -47,7 +47,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-8c-8g
     project: 'policy/apex-pdp'
     project-name: 'policy-apex-pdp'
     branch: 'master'
diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index 661b351..9cb4ca0 100644 (file)
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -7,13 +7,13 @@
       - '{project-name}-{stream}-merge-java':
           docker-pom: 'pom.xml'
           mvn-params: '-P docker'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -29,7 +29,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-distribution-sonar
@@ -41,7 +41,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: 'policy/distribution'
     project-name: 'policy-distribution'
     branch: 'master'
diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index 5688d1f..61ac6fe 100644 (file)
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -8,9 +8,9 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: "-P docker"
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -25,7 +25,7 @@
     mvn-settings: 'policy-docker-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-docker-base-common
@@ -37,7 +37,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           pattern: 'do_not_match_any_file'
       - '{project-name}-{stream}-merge-java':
           project-name: 'policy-docker-arm64'
@@ -60,7 +60,7 @@
                pattern: 'do_not_match_any_file'
       - gerrit-maven-docker-stage:
           project-name: 'policy-docker-amd64'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
           container-public-registry: 'docker.io'
@@ -70,7 +70,7 @@
              - compare-type: REG_EXP
                pattern: 'do_not_match_any_file'
       - '{project-name}-docker-manifest-{stream}':
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - '{project-name}-multiarch-docker-stage-{stream}'
 #      - '{project-name}-gerrit-release-jobs':
 #          build-node: centos7-docker-8c-8g
@@ -82,7 +82,7 @@
     mvn-settings: 'policy-docker-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-docker-clm
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 7935f33..d255266 100644 (file)
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -13,9 +13,9 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker'
+          mvn-params: '-P docker  -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
@@ -29,7 +29,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: policy-drools-applications-sonar
@@ -41,7 +41,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: 'policy/drools-applications'
     project-name: 'policy-drools-applications'
     branch: 'master'
@@ -60,7 +60,7 @@
     branch: 'master'
     mvn-settings: 'policy-drools-applications-settings'
     java-version: openjdk11
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: policy-drools-applications-info
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 25b45e0..6440e35 100644 (file)
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -13,9 +13,9 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker'
+          mvn-params: '-P docker  -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
@@ -29,7 +29,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: policy-drools-pdp-sonar
@@ -41,7 +41,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: 'policy/drools-pdp'
     project-name: 'policy-drools-pdp'
     branch: 'master'
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index 0ebc274..9f8030a 100644 (file)
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -13,9 +13,9 @@
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker'
+          mvn-params: '-P docker  -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
@@ -29,7 +29,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: policy-engine-sonar
@@ -41,7 +41,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: 'policy/engine'
     project-name: 'policy-engine'
     branch: 'master'
@@ -61,7 +61,7 @@
     branch: 'master'
     mvn-settings: 'policy-engine-settings'
     java-version: openjdk11
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
 
 - project:
     name: policy-engine-info
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index 5b82536..862c040 100644 (file)
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -18,10 +18,10 @@
           mvn-params: '-P docker -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-          enabled: false
+          disabled: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-builder-4c-4g
-          enabled: false
+          disabled: true
 
     project: 'policy/gui'
     stream:
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 7db9862..cb7d0c9 100644 (file)
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -16,7 +16,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -DskipTests'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -32,7 +32,7 @@
     mvn-settings: 'so-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: so-sonar
@@ -45,7 +45,7 @@
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     max-git-repo-age-hours: 48
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'so'
     project-name: 'so'
     branch: 'master'
@@ -58,12 +58,12 @@
     jobs:
       - 'onap-gerrit-maven-coverity'
     cron: '@daily'
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
     project: 'so'
     project-name: 'so'
     branch: 'master'
     mvn-settings: 'so-settings'
-    mvn-params: '-Dmaven.test.skip=true'
+    mvn-params: '-DskipTests'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     coverity-project-name: 'onap-so'
     coverity-token: 'SrGGJp9T1n1lhJn2sF72XQ'
@@ -88,7 +88,7 @@
     nexus-iq-namespace: 'onap-'
     project: so
     project-name: 'so'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     stream:
       - 'master':
           branch: 'master'
diff --git a/jjb/usecases/config-over-netconf.yaml b/jjb/usecases/usecases-csit.yaml
similarity index 82%
rename from jjb/usecases/config-over-netconf.yaml
rename to jjb/usecases/usecases-csit.yaml
index 27491d1..69e92f8 100644 (file)
--- a/jjb/usecases/config-over-netconf.yaml
+++ b/jjb/usecases/usecases-csit.yaml
@@ -13,4 +13,7 @@
       - 'config-over-netconf':
           trigger_jobs:
             - '{project-name}-{stream}-docker-java-shell-daily'
+      - 'pnf-sw-upgrade':
+          trigger_jobs:
+            - '{project-name}-{stream}-docker-java-shell-daily'
     robot-options: ''
Management repo for Jenkins Job Builder, builder scripts and management related to the CI configuration.