From: mrichomme <morgan.richomme@orange.com>
Date: Tue, 28 Apr 2020 12:52:54 +0000 (+0200)
Subject: Simplify testsuite build chain
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=bbfb12f49dd1ee86a47b29c1007994deb547210e;p=ci-management.git

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
---

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'