diff options
| author |   mrichomme <morgan.richomme@orange.com> | 2020-04-28 14:52:54 +0200 |
|---|---|---|
| committer | mrichomme <morgan.richomme@orange.com> | 2020-04-28 14:52:54 +0200 |
| commit | bbfb12f49dd1ee86a47b29c1007994deb547210e (patch) | |
| tree | 450c73d7dab98a52e67c3393d96f16120460ccae | |
| parent | 7b9909c7089b806f16b38a6ecbe74a8ee0644b3c (diff) | |
Simplify testsuite build chain
Docker is built from the Dockerfile, no need to reference extra repositories
Issue-ID: INT-1558
Signed-off-by: mrichomme <morgan.richomme@orange.com>
Change-Id: I024d847b96ddedbf985feffa8b9efc1ce8c991ad
| -rw-r--r-- | jjb/global-templates-python.yaml | 16 | ||||
| -rw-r--r-- | jjb/testsuite/testsuite.yaml | 17 |
2 files changed, 0 insertions, 33 deletions
diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml index b30af0ea5..6480daa81 100644 --- a/jjb/global-templates-python.yaml +++ b/jjb/global-templates-python.yaml @@ -99,27 +99,11 @@ 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-docker-build: diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml index 58bab20a6..cb70a0819 100644 --- a/jjb/testsuite/testsuite.yaml +++ b/jjb/testsuite/testsuite.yaml @@ -24,26 +24,9 @@ project: 'testsuite' - extra-project1: 'testsuite/python-testing-utils' - extra-branch1: '{branch}' - extra-refspec1: 'refs/heads/{branch}' - checkout-dir1: 'testsuite/eteutils' - - extra-project2: 'testsuite/heatbridge' - extra-branch2: '{branch}' - extra-refspec2: 'refs/heads/{branch}' - checkout-dir2: 'testsuite/heatbridge' - - extra-project3: 'demo' - extra-branch3: '{branch}' - extra-refspec3: 'refs/heads/{branch}' - checkout-dir3: 'demo' - stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' - 'elalto': branch: 'elalto' mvn-settings: 'testsuite-settings' |