From f9cfaf45017781511673c1e080044e846aac516d Mon Sep 17 00:00:00 2001 From: jf9860 Date: Thu, 23 Feb 2017 19:39:39 -0500 Subject: clone eteutils and heatbridge for setup.sh Changes as pre review Change-Id: I9325522c118cc46eabfbf350b0ee5ec088df5707 Signed-off-by: jf9860 --- jjb/global-templates-python.yaml | 58 ++++++++++++++++++++++++++++++++++++++++ jjb/testsuite/testsuite.yaml | 9 +++++++ 2 files changed, 67 insertions(+) (limited to 'jjb') diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml index a972baaee..173ba4cf7 100644 --- a/jjb/global-templates-python.yaml +++ b/jjb/global-templates-python.yaml @@ -98,6 +98,64 @@ 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 DOCKER_REPOSITORY="nexus3.openecomp.org:10003" + docker tag openecomp/testsuite:latest $DOCKER_REPOSITORY/openecomp/testsuite:latest + docker push $DOCKER_REPOSITORY/openecomp/testsuite:latest + +- job-template: + name: '{project-name}-{stream}-2scm-docker-shell-daily' + project-type: freestyle + node: 'ubuntu1604-docker-8c-8g' + + properties: + - ecomp-infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - ecomp-infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + + 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: + - ecomp-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: diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml index 399a53558..da0722b79 100644 --- a/jjb/testsuite/testsuite.yaml +++ b/jjb/testsuite/testsuite.yaml @@ -6,6 +6,15 @@ - '{project-name}-{stream}-docker-shell-daily' project: 'testsuite' + extra-project1: 'python-testing-utils' + extra-branch1: 'master' + extra-refspec1: 'refs/heads/{branch}' + checkout-dir1: 'testsuite/eteutils' + + extra-project2: 'heatbridge' + extra-branch2: 'master' + extra-refspec2: 'refs/heads/{branch}' + checkout-dir2: 'testsuite/heatbridge' stream: - 'master': -- cgit 1.2.3-korg