X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fglobal-templates-python.yaml;h=ec9002eda0d9611a29f540c96a9d4426a1c244cf;hb=75c66f983bfed92ff2313f79ad3beaa485bae1e4;hp=173ba4cf7e75f6c5e4a6fd9f88b592dd9bc4ca43;hpb=a6efbb49541f6527beb0161e74840b9563876042;p=ci-management.git

diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml
index 173ba4cf7..ec9002eda 100644
--- a/jjb/global-templates-python.yaml
+++ b/jjb/global-templates-python.yaml
@@ -21,23 +21,26 @@
     node: '{build-node}'
 
     properties:
-      - ecomp-infra-properties:
+      - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
-      - ecomp-infra-parameters:
+      - infra-parameters:
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
+      - maven-exec:
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -61,9 +64,9 @@
           cd $WORKSPACE/{path}
           tox
 
-#     publishers:
-#       - ecomp-infra-shiplogs:
-#           maven-version: 'mvn33'
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
 
 - job-template:
     name: '{project-name}-{stream}-docker-shell-daily'
@@ -71,23 +74,26 @@
     node: 'ubuntu1604-docker-8c-8g'
 
     properties:
-      - ecomp-infra-properties:
+      - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
-      - ecomp-infra-parameters:
+      - infra-parameters:
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
+      - maven-exec:
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -109,9 +115,13 @@
       - shell: |
           cp $WORKSPACE/docker/* .
           docker -D build -t openecomp/testsuite .
-          export DOCKER_REPOSITORY="nexus3.openecomp.org:10003"
-          docker tag openecomp/testsuite:latest $DOCKER_REPOSITORY/openecomp/testsuite:latest
-          docker push $DOCKER_REPOSITORY/openecomp/testsuite:latest
+          export REPO="nexus3.onap.org:10003"
+          docker tag openecomp/testsuite:latest $REPO/openecomp/testsuite:1.0-STAGING-latest
+          docker push $REPO/openecomp/testsuite:1.0-STAGING-latest
+
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
 
 - job-template:
     name: '{project-name}-{stream}-2scm-docker-shell-daily'
@@ -119,20 +129,23 @@
     node: 'ubuntu1604-docker-8c-8g'
 
     properties:
-      - ecomp-infra-properties:
+      - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
-      - ecomp-infra-parameters:
+      - infra-parameters:
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
+      - maven-exec:
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
       - git-extra-project:
           project: '{extra-project1}'
           refspec: '{extra-refspec1}'
@@ -145,7 +158,7 @@
           checkout-dir: '{checkout-dir2}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -162,11 +175,82 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
 
+      - inject:
+          properties-file: version.properties
+
       - docker-login
 
-      - shell: |
-          cp $WORKSPACE/docker/* .
-          docker -D build -t openecomp/testsuite .
-          export DOCKER_REPOSITORY="nexus3.openecomp.org:10003"
-          docker tag openecomp/testsuite:latest $DOCKER_REPOSITORY/openecomp/testsuite:latest
-          docker push $DOCKER_REPOSITORY/openecomp/testsuite:latest
\ No newline at end of file
+      - shell: '{script}'
+
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
+
+- job-template:
+    name: '{project-name}-{stream}-3scm-docker-shell-daily'
+    project-type: freestyle
+    node: 'ubuntu1604-docker-8c-8g'
+
+    properties:
+      - infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - maven-exec:
+          maven-version: '{maven-version}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
+      - git-extra-project:
+          project: '{extra-project1}'
+          refspec: '{extra-refspec1}'
+          branch: '{extra-branch1}'
+          checkout-dir: '{checkout-dir1}'
+      - git-extra-project:
+          project: '{extra-project2}'
+          refspec: '{extra-refspec2}'
+          branch: '{extra-branch2}'
+          checkout-dir: '{checkout-dir2}'
+      - git-extra-project:
+          project: '{extra-project3}'
+          refspec: '{extra-refspec3}'
+          branch: '{extra-branch3}'
+          checkout-dir: '{checkout-dir3}'
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      # 12 AM UTC
+      - timed: 'H 12 * * *'
+      - gerrit-trigger-release-manually:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+
+    builders:
+
+      - provide-maven-settings:
+          global-settings-file: 'global-settings'
+          settings-file: '{mvn-settings}'
+
+      - inject:
+          properties-file: version.properties
+
+      - docker-login
+
+      - shell: '{script}'
+
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
+