Refactor!: JJB code comply with updates to v5.x

[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 6947e12..6b87670 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
@@ -36,7 +36,6 @@
     #      - dcaegen2-docker-python-jobs
 
     name: '{project-name}-docker-python-jobs'
-    id: dcaegen2-services-docker-python-jobs
     container-tag-method: latest
     docker-get-container-tag-script: '../../shell/docker-ts-tag-override.sh'
     nexus-iq-namespace: 'onap-'
@@ -44,7 +43,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}'
@@ -70,22 +68,6 @@
               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: jakarta
-          branch: jakarta
-          cron: ''
-      - gerrit-whitesource-scan:
-          build-timeout: 120
-          submodule-timeout: 30
-          java-opts: '-Xmx2048m'
-          mvn-pom: '{src-dir}/pom.xml'
       - gerrit-tox-sonar:
           # workaround because gerrit-tox-sonar doesn't support mvn-params/opts
           sonar-mvn-goal: '-f {src-dir}/pom.xml sonar:sonar'
@@ -102,16 +84,33 @@
       - dcaegen2-services-pmsh:
           src-dir: components/pm-subscription-handler
           docker-name: onap/org.onap.dcaegen2.services.pmsh
+    stream:
+      - master:
+          branch: master
+      - kohn:
+          branch: kohn
+    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
-      - jakarta:
-          branch: jakarta
+      - kohn:
+          branch: kohn
+    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