X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-platform-docker-python-subprojects.yaml;h=7adbfdd48add33f3a98738ee692f4473630e3ffa;hb=6633c8385873029713b06369e04694e07e86e607;hp=911435c1a0fed08ce0ab62124a6047d4391d798c;hpb=d5ebee15de6933ccfb42f46fbdda63c9f0cf912b;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
index 911435c1a..7adbfdd48 100644
--- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
@@ -20,10 +20,13 @@
     #    project-name:
     #      - subproject-name1:
     #          src-dir: subproject-dir1
+    #          docker-name: onap/org.onap.dcaegen2.platform.something.name1
     #      - subproject-name2:
     #          src-dir: subproject-dir2
+    #          docker-name: onap/org.onap.dcaegen2.platform.something.name2
     #      - subproject-name3:
     #          src-dir: subproject-dir3
+    #          docker-name: onap/org.onap.dcaegen2.platform.something.name3
     #    stream:
     #      - master:
     #          branch: master
@@ -39,16 +42,26 @@
     nexus-iq-namespace: 'onap-'
     tox-dir: '{src-dir}'
     docker-root: '{src-dir}'
-    docker-name: 'onap/{project-name}'
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: '{src-dir}/.*'
     jobs:
       - gerrit-tox-verify:
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
           stream: all
           branch: '*'
       - 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-maven-clm:
           mvn-params: '-f {src-dir}'
           stream: master
@@ -59,32 +72,37 @@
           cron: '@daily'
           stream: master
           branch: master
-      - gerrit-release-verify
-      - gerrit-release-merge
+          sonarcloud: true
+          sonarcloud-project-organization: '{sonarcloud_project_organization}'
+          sonarcloud-api-token: '{sonarcloud_api_token}'
+          sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+
 
 - project:
     name: dcaegen2-platform-docker-python-subprojects
     project: dcaegen2/platform
     mvn-settings: dcaegen2-platform-settings
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name:
-      - dcaegen2-platform-aoadapter:
+      - dcaegen2-platform-adapter-acumos:
           src-dir: adapter/acumos
+          docker-name: onap/org.onap.dcaegen2.platform.adapter.acumos
       - dcaegen2-platform-mod-distributorapi:
           src-dir: mod/distributorapi
+          docker-name: onap/org.onap.dcaegen2.platform.mod.distributorapi
       - dcaegen2-platform-mod-onboardingapi:
           src-dir: mod/onboardingapi
-      - dcaegen2-platform-oti-event-handler:
-          src-dir: oti/event-handler
+          docker-name: onap/org.onap.dcaegen2.platform.mod.onboardingapi
     stream:
       - master:
           branch: master
+      - jakarta:
+          branch: jakarta
+
     views:
       - project-view:
-          project-name: dcaegen2-platform-aoadapter
+          project-name: dcaegen2-platform-adapter
       - project-view:
           project-name: dcaegen2-platform-mod
-      - project-view:
-          project-name: dcaegen2-platform-oti
     jobs:
       - dcaegen2-docker-python-jobs