Change sdc-merge template

[ci-management.git] / jjb / global-templates-python.yaml

diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml
index 9c3c463..248d456 100644 (file)
--- a/jjb/global-templates-python.yaml
+++ b/jjb/global-templates-python.yaml
@@ -21,17 +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: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -39,7 +39,7 @@
           choosing-strategy: 'gerrit'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -64,8 +64,8 @@
           tox
 
 #     publishers:
-#       - ecomp-infra-shiplogs:
-#           maven-version: 'mvn33'
+#       - infra-shiplogs:
+#           maven-version: '{maven-version}'
 
 - job-template:
     name: '{project-name}-{stream}-docker-shell-daily'
@@ -73,17 +73,17 @@
     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: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -91,7 +91,7 @@
           choosing-strategy: 'default'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -113,9 +113,9 @@
       - 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
 
 - job-template:
     name: '{project-name}-{stream}-2scm-docker-shell-daily'
@@ -123,17 +123,17 @@
     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: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -151,7 +151,7 @@
           checkout-dir: '{checkout-dir2}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -168,11 +168,17 @@
           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
+          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