X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-services-docker-python-subprojects.yaml;h=77099cc69c13b4dd7abc5cc12fcdd0d56f97dc9a;hb=b39543603f98c745ece0f049644f6583a64d6195;hp=1f862244bcb2973e283c52ff6661c5c6ce70c710;hpb=aa3af93db0b98347ad62a193339f24acef730427;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
index 1f862244b..77099cc69 100644
--- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
@@ -41,7 +41,7 @@
     docker-get-container-tag-script: '../../shell/docker-ts-tag-override.sh'
     nexus-iq-namespace: 'onap-'
     tox-dir: '{src-dir}'
-    tox-envs: 'py3'
+    tox-envs: 'py3.9'
     sonarcloud: true
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-api-token: '{sonarcloud_api_token}'
@@ -54,10 +54,33 @@
         pattern: '{src-dir}/.*'
     jobs:
       - gerrit-tox-verify:
-          stream: master
-          branch: 'master'
+          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
+          stream: master
+          branch: master
+      - gerrit-docker-merge-maintainance:
+          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 push $DNAME:$DOCKER_IMAGE_TAG2
+          stream: istanbul
+          branch: istanbul
+          cron: ''
       - gerrit-whitesource-scan:
           build-timeout: 120
           submodule-timeout: 30
@@ -74,14 +97,21 @@
     name: dcaegen2-services-docker-python-subprojects
     project: dcaegen2/services
     mvn-settings: dcaegen2-services-settings
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name:
       - dcaegen2-services-pmsh:
           src-dir: components/pm-subscription-handler
           docker-name: onap/org.onap.dcaegen2.services.pmsh
+      - dcaegen2-services-ml-prediction-ms:
+          src-dir: components/ml-prediction-ms
+          docker-name: onap/org.onap.dcaegen2.services.ml-prediction-ms
     stream:
       - master:
           branch: master
+      - istanbul:
+          branch: istanbul
+      - jakarta:
+          branch: jakarta
     views:
       - project-view:
           project-name: dcaegen2-services-pmsh