X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fglobal-templates-python.yaml;h=248d4561fd050e21a0285dcf01b97a4cf6076dc1;hb=07f8b01d67044d98a893a286fa261d1174a670e1;hp=7404b7e7446e305a1f91391d0407832ed6a9fd91;hpb=72bfacc4081bab36ce695a720521cdf5bfc0bc54;p=ci-management.git

diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml
index 7404b7e74..248d4561f 100644
--- a/jjb/global-templates-python.yaml
+++ b/jjb/global-templates-python.yaml
@@ -21,15 +21,17 @@
     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:
@@ -37,7 +39,7 @@
           choosing-strategy: 'gerrit'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -52,6 +54,7 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - shell: |
+          #!/bin/bash
           virtualenv $WORKSPACE/venv-tox
           source $WORKSPACE/venv-tox/bin/activate
           pip install --upgrade pip
@@ -61,5 +64,121 @@
           tox
 
 #     publishers:
-#       - ecomp-infra-shiplogs:
-#           maven-version: 'mvn33'
+#       - infra-shiplogs:
+#           maven-version: '{maven-version}'
+
+- job-template:
+    name: '{project-name}-{stream}-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'
+
+    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}'
+
+      - docker-login
+
+      - shell: |
+          cp $WORKSPACE/docker/* .
+          docker -D build -t openecomp/testsuite .
+          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
+
+- job-template:
+    name: '{project-name}-{stream}-2scm-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'
+      - 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}'
+
+    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: |
+          cp $WORKSPACE/docker/* .
+          docker -D build -t openecomp/testsuite .
+          export REPO="nexus3.onap.org:10003"
+          for tag in $tags
+          do
+              docker tag openecomp/testsuite:latest $REPO/openecomp/testsuite:$tag
+              docker push $REPO/openecomp/testsuite:$tag
+          done