Merge "[DCAEGEN2] Change mvn version on tca-gen2 project"

diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
index e5ec5e6..97e7768 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
@@ -67,6 +67,19 @@
               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: honolulu
+          branch: honolulu
+          cron: ''
       - gerrit-whitesource-scan:
           build-timeout: 120
           submodule-timeout: 30
@@ -91,8 +104,6 @@
     stream:
       - master:
           branch: master
-      - guilin:
-          branch: guilin
       - honolulu:
           branch: honolulu
     views:

diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper-csit.yaml
new file mode 100644 (file)
index 0000000..f7bbf5a
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper-csit.yaml
@@ -0,0 +1,18 @@
+---
+- project:
+      name: dcaegen2-services-pm-mapper-csit
+      jobs:
+          - '{project-name}-review-verification-maven-{stream}':
+                  mvn-goals: clean install docker:build
+          - '{project-name}-merge-verification-maven-{stream}':
+                  mvn-goals: clean install docker:build
+      project-name: 'dcaegen2-services-pm-mapper'
+      recipients: 'vv770d@att.com lego@est.tech rajendra.jaiswal@ericsson.com'
+      # project name in gerrit
+      project: 'dcaegen2/services/pm-mapper'
+      stream:
+          - 'master':
+                branch: 'master'
+      mvn-settings: 'dcaegen2-services-pm-mapper-settings'
+      robot-options: ''
+      branch: 'master'

diff --git a/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml
deleted file mode 100644 (file)
index b68e769..0000000
--- a/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-- project:
-    name: dcae-bulkpm-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'dcaegen2-pmmapper'
-    recipients: 'vv770d@att.com lego@est.tech rajendra.jaiswal@ericsson.com'
-    stream:
-      - 'master':
-          branch: 'master'
-    functionality:
-      - 'pmmapper':
-          trigger_jobs:
-      - 'files-processing-config-pmmapper':
-          trigger_jobs:
-    robot-options: ''
-    branch: 'master'