Merge "Setup per Golang project build script"

diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
index 685582e..8be8b82 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
@@ -50,7 +50,16 @@
           stream: all
           branch: '*'
       - gerrit-docker-verify
-      - gerrit-docker-merge
+      - gerrit-docker-merge:
+          post_docker_build_script: |
+              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-maven-clm:
           mvn-params: '-f {src-dir}'
           stream: master

diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index fc57249..5b82536 100644 (file)
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -7,19 +7,21 @@
       - '{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'
           container-staging-registry: 'nexus3.onap.org:10003'
+          enabled: false
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-builder-4c-4g
+          enabled: false
 
     project: 'policy/gui'
     stream:
@@ -29,7 +31,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-gui-sonar
@@ -41,7 +43,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/gui'
     project-name: 'policy-gui'
     branch: 'master'

diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 323bca4..7db9862 100644 (file)
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -18,7 +18,7 @@
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true'
+          mvn-params: '-P docker -DskipTests'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':