summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerry Flood <jf9860@att.com>2017-05-02 16:00:03 -0400
committerJerry Flood <jf9860@att.com>2017-05-03 11:48:42 -0400
commitffab4f773e77204e96cd6c37cbeb1979ad41e302 (patch)
treeb3e41f3c119eadd6cedd5d7a22112c544f3a338c
parent5b598346c4943e967ecc7891745d408954592f7c (diff)
Add the demo git to the build.
robot repo should use demo repo as a submodule instead of a copy of their stuff. Coordination is needed between demo Also move the shell script out of the template as per review Issue: TEST-14 Change-Id: I0c1d8d9d3b1317d1c099c8fdaafa389af71d7b60 Signed-off-by: Jerry Flood <jf9860@att.com>
-rw-r--r--jjb/global-templates-python.yaml78
-rw-r--r--jjb/testsuite/testsuite-docker.sh11
-rw-r--r--jjb/testsuite/testsuite.yaml9
3 files changed, 88 insertions, 10 deletions
diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml
index 63f6131f8..d787b3831 100644
--- a/jjb/global-templates-python.yaml
+++ b/jjb/global-templates-python.yaml
@@ -177,16 +177,76 @@
- 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
+ - 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'
+ - 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}'
+
diff --git a/jjb/testsuite/testsuite-docker.sh b/jjb/testsuite/testsuite-docker.sh
new file mode 100644
index 000000000..33eea4f81
--- /dev/null
+++ b/jjb/testsuite/testsuite-docker.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO CREATE DOCKER IMAGES ================='
+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
diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index d9d883188..80897dbb9 100644
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -3,7 +3,9 @@
name: testsuite
project-name: 'testsuite'
jobs:
- - '{project-name}-{stream}-2scm-docker-shell-daily'
+ - '{project-name}-{stream}-3scm-docker-shell-daily':
+ script:
+ !include-raw-escape: 'testsuite-docker.sh'
project: 'testsuite'
extra-project1: 'testsuite/python-testing-utils'
@@ -16,6 +18,11 @@
extra-refspec2: 'refs/heads/{branch}'
checkout-dir2: 'testsuite/heatbridge'
+ extra-project3: 'demo'
+ extra-branch3: 'master'
+ extra-refspec3: 'refs/heads/{branch}'
+ checkout-dir3: 'demo'
+
stream:
- 'master':
branch: 'master'