Adding dcaegen2/services submodule JJBs

Change-Id: I32d85b0d0f638fb54d5bc5412f4cbcd77923f95d
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Issue-ID: DCAEGEN2-1837

3 files changed, 90 insertions, 66 deletions

diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
new file mode 100644
index 000000000..1f862244b
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
@@ -0,0 +1,89 @@
+---
+- job-group:
+    # This job group contains all the jobs that should be deployed for
+    # a subproject of dcaegen2/services that builds a Docker image from
+    # Python code.
+    #
+    # Required parameters:
+    #  build-node: The node to run build on.
+    #  mvn-settings: Maven settings.xml file containing credentials to use.
+    #  project-name: The job name prefix
+    #  src-dir: The subdirectory of the repository containing subproject code
+    #  stream: The stream to build
+    #  branch: The branch to build
+    #
+    #  Note: Multiple subprojects can be built with a single JJB project
+    #  by specifying the value of project-name as a list.
+    #  Similarly, multiple streams can be built with a single JJB project
+    #  by specifying the value of the stream as a list.
+    #  For example:
+    #    project-name:
+    #      - subproject-name1:
+    #          src-dir: subproject-dir1
+    #          docker-name: onap/org.onap.dcaegen2.services.something.name1
+    #      - subproject-name2:
+    #          src-dir: subproject-dir2
+    #          docker-name: onap/org.onap.dcaegen2.services.something.name2
+    #      - subproject-name3:
+    #          src-dir: subproject-dir3
+    #          docker-name: onap/org.onap.dcaegen2.services.something.name3
+    #    stream:
+    #      - master:
+    #          branch: master
+    #      - release1:
+    #          branch: release1.0
+    #    jobs:
+    #      - 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-'
+    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}'
+    python-version: python3
+    wss-product-name: '{project-name}'
+    docker-root: '{src-dir}'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: '{src-dir}/.*'
+    jobs:
+      - gerrit-tox-verify:
+          stream: master
+          branch: 'master'
+      - 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-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'
+          stream: master
+          branch: master
+
+- project:
+    name: dcaegen2-services-docker-python-subprojects
+    project: dcaegen2/services
+    mvn-settings: dcaegen2-services-settings
+    build-node: ubuntu1604-docker-8c-8g
+    project-name:
+      - dcaegen2-services-pmsh:
+          src-dir: components/pm-subscription-handler
+          docker-name: onap/org.onap.dcaegen2.services.pmsh
+    stream:
+      - master:
+          branch: master
+    views:
+      - project-view:
+          project-name: dcaegen2-services-pmsh
+    jobs:
+      - dcaegen2-services-docker-python-jobs
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml
index 20dcad43a..a6bc305c3 100644
--- a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml
@@ -11,5 +11,5 @@
     functionality:
       - 'testsuite':
           trigger_jobs:
-            - '{project-name}-{stream}-release-version-java-daily'
+            - '{project-name}-docker-merge-master'
     robot-options: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml
deleted file mode 100644
index 87c5a7175..000000000
--- a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-- dcaegen2_services_common: &dcaegen2_services_common
-    # values apply to all dcaegen2_services docker projects
-    name: dcaegen2-services-docker-common
-    project: dcaegen2/services
-    # maven settings file has docker credentials
-    mvn-settings: dcaegen2-services-settings
-    # use host network to clone from our gerrit
-    container-tag-method: latest
-    build-node: ubuntu1604-docker-8c-8g
-    # jenkins job name prefix
-    project-name: '{name}'
-    tox-dir: '{docker-root}'
-    # build only on relevant changes
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '{docker-root}/.*'
-
-- project:
-    <<: *dcaegen2_services_common
-    name: dcaegen2-services-pmsh
-    # root of docker build
-    docker-root: components/pm-subscription-handler
-    # tag override
-    # Following is dependent on merge https://gerrit.onap.org/r/#/c/ci-management/+/99313/
-    docker-get-container-tag-script: '../../shell/docker-ts-tag-override.sh'
-    # image name
-    docker-name: 'onap/org.onap.dcaegen2.services.pmsh'
-    stream:
-      - master:
-            branch: master
-    jobs:
-      - gerrit-docker-verify
-      - gerrit-docker-merge
-
-- project:
-    <<: *dcaegen2_services_common
-    name: dcaegen2-services-pmsh-verify
-    docker-root: components/pm-subscription-handler
-    stream:
-      - all:
-            branch: '*'
-    jobs:
-      - gerrit-tox-verify
-
-- project:
-    <<: *dcaegen2_services_common
-    name: dcaegen2-services-pmsh-sonar
-    docker-root: components/pm-subscription-handler/
-    cron: '@daily'
-    branch: master
-    jobs:
-      - gerrit-tox-sonar
-
-- project:
-    <<: *dcaegen2_services_common
-    name: dcaegen2-services-pmsh-clm
-    docker-root: components/pm-subscription-handler
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project-name: 'dcaegen2-services-pmsh-clm'
-    mvn-params: '-f components/pm-subscription-handler/pom.xml'
-    branch: 'master'
-