X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-services-docker-python-subprojects.yaml;h=c44963b0b04d33510d463f7d8d517de16be7b309;hb=e46f9aa926bb423cb983cfdcbd9d029cd69f5301;hp=be95546f1684a33646a05b96f775592c44e5b7df;hpb=9e30d7b63a4cbc147fa1fc938fcb7a1d2f92fc38;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 be95546f1..c44963b0b 100644
--- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
@@ -35,38 +35,42 @@
     #    jobs:
     #      - dcaegen2-docker-python-jobs
 
-    name: '{project-name}-docker-python-jobs'
-    id: dcaegen2-services-docker-python-jobs
+    name: "{project-name}-docker-python-jobs"
     container-tag-method: latest
-    docker-get-container-tag-script: '../../shell/docker-ts-tag-override.sh'
-    nexus-iq-namespace: 'onap-'
-    tox-dir: '{src-dir}'
-    tox-envs: 'py3'
+    docker-get-container-tag-script: "../../shell/docker-ts-tag-override.sh"
+    nexus-iq-namespace: "onap-"
+    tox-dir: "{src-dir}"
+    tox-envs: "py3"
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     python-version: python3
-    wss-product-name: '{project-name}'
-    docker-root: '{src-dir}'
+    wss-product-name: "{project-name}"
+    docker-root: "{src-dir}"
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: '{src-dir}/.*'
+        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-whitesource-scan:
-          build-timeout: 120
-          submodule-timeout: 30
-          java-opts: '-Xmx2048m'
-          mvn-pom: '{src-dir}/pom.xml'
+      - 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-tox-sonar:
           # workaround because gerrit-tox-sonar doesn't support mvn-params/opts
-          sonar-mvn-goal: '-f {src-dir}/pom.xml sonar:sonar'
-          cron: '@daily'
+          sonar-mvn-goal: "-f {src-dir}/pom.xml sonar:sonar"
           stream: master
           branch: master
 
@@ -82,8 +86,30 @@
     stream:
       - master:
           branch: master
+      - london:
+          branch: london
+    jobs:
+      - "{project-name}-docker-python-jobs"
+
+- project:
+    name: dcaegen2-services-ml
+    project: dcaegen2/services
+    mvn-settings: dcaegen2-services-settings
+    build-node: ubuntu1804-docker-8c-8g
+    project-name:
+      - 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
+      - london:
+          branch: london
+    jobs:
+      - "{project-name}-docker-python-jobs"
+
+- project:
+    name: dcaegen2-services-subprojects-view
     views:
       - project-view:
           project-name: dcaegen2-services-pmsh
-    jobs:
-      - dcaegen2-services-docker-python-jobs