Merge "VOL-1903 build container during test"
diff --git a/jjb/pipeline/xos-integration-tests.groovy b/jjb/pipeline/xos-integration-tests.groovy
index 7ddccad..27bc34f 100644
--- a/jjb/pipeline/xos-integration-tests.groovy
+++ b/jjb/pipeline/xos-integration-tests.groovy
@@ -90,7 +90,12 @@
helm-repo-tools/wait_for_pods.sh
helm dep up xos-core
- helm install --set images.xos_core.tag=master xos-core -n xos-core
+
+ if [[ ${gerritProject} == "xos"]]; then
+ helm install --set images.xos_core.tag=master xos-core -n xos-core;
+ else
+ helm install xos-core -n xos-core;
+ fi
helm dep update xos-profiles/seba-services
helm install xos-profiles/seba-services
diff --git a/jjb/verify/exampleservice.yaml b/jjb/verify/exampleservice.yaml
index 819e4c4..14ab74e 100644
--- a/jjb/verify/exampleservice.yaml
+++ b/jjb/verify/exampleservice.yaml
@@ -9,12 +9,6 @@
- 'verify-exampleservice-common':
branch-regexp: '{supported-branches-regexp}'
- - 'verify-exampleservice-jobs-modern':
- branch-regexp: '{modern-branches-regexp}'
-
- - 'verify-exampleservice-jobs-legacy':
- branch-regexp: '{legacy-branches-regexp}'
-
- job-group:
name: 'verify-exampleservice-common'
jobs:
@@ -23,20 +17,3 @@
dependency-jobs: 'verify_exampleservice_licensed'
- 'verify-sonarqube':
dependency-jobs: 'verify_exampleservice_tag-collision'
-
-- job-group:
- name: 'verify-exampleservice-jobs-modern'
- jobs:
- - 'api-test':
- dependency-jobs: 'verify_exampleservice_sonarqube'
- pipeline_script: 'all-xos-api-test-helm.groovy'
-
-- job-group:
- name: 'verify-exampleservice-jobs-legacy'
- jobs:
- - 'api-test':
- name-extension: '-legacy'
- dependency-jobs: 'verify_exampleservice_sonarqube'
- pipeline_script: 'all-xos-api-test.groovy'
-
-