Chore: Move to centos8-builder

[ci-management.git] / jjb / dcaegen2 / dcaegen2-services-docker-python-subprojects.yaml

diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
index ab5b27e..634d1d8 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
@@ -44,7 +44,6 @@
     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}'
     python-version: python3
     wss-product-name: '{project-name}'
@@ -54,6 +53,7 @@
         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
@@ -67,11 +67,19 @@
               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
-          java-opts: '-Xmx2048m'
-          mvn-pom: '{src-dir}/pom.xml'
+          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: kohn
+          branch: kohn
+          cron: ''
       - gerrit-tox-sonar:
           # workaround because gerrit-tox-sonar doesn't support mvn-params/opts
           sonar-mvn-goal: '-f {src-dir}/pom.xml sonar:sonar'
@@ -88,11 +96,14 @@
       - 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
-      - guilin:
-          branch: guilin
+      - kohn:
+          branch: kohn
     views:
       - project-view:
           project-name: dcaegen2-services-pmsh