[SEBA-497] Fix how xos containers are built/tested
Change-Id: I17cc8b9562021d925756ce3dc81854a45062ffd9
diff --git a/jjb/verify/chameleon.yaml b/jjb/verify/chameleon.yaml
index 02bb32c..f5fc3ae 100644
--- a/jjb/verify/chameleon.yaml
+++ b/jjb/verify/chameleon.yaml
@@ -18,7 +18,9 @@
- 'tag-collision-reject':
dependency-jobs: 'verify_chameleon_licensed'
- 'python-unit-test':
- dependency-jobs: 'verify_chameleon_sonarqube'
+ dependency-jobs: 'verify_chameleon_tag-collision'
+ - 'xos-auth':
+ dependency-jobs: 'verify_chameleon_unit-test'
- job-group:
name: 'publish-chameleon-jobs'
diff --git a/jjb/verify/xos-tosca.yaml b/jjb/verify/xos-tosca.yaml
index 1eaeeab..bdcca9f 100644
--- a/jjb/verify/xos-tosca.yaml
+++ b/jjb/verify/xos-tosca.yaml
@@ -15,12 +15,8 @@
- 'verify-licensed'
- 'tag-collision-reject':
dependency-jobs: 'verify_xos-tosca_licensed'
- - 'verify-sonarqube':
+ - 'python-unit-test':
dependency-jobs: 'verify_xos-tosca_tag-collision'
- 'api-test':
- dependency-jobs: 'verify_xos-tosca_sonarqube'
pipeline_script: 'all-xos-api-test-helm.groovy'
- - 'xos-tosca-unit-test':
- dependency-jobs: 'verify_xos-tosca_sonarqube'
- - 'xos-tosca-e2e-test':
- dependency-jobs: 'verify_xos-tosca_sonarqube'
+ dependency-jobs: 'verify_xos-tosca_unit-test'
diff --git a/jjb/verify/xos.yaml b/jjb/verify/xos.yaml
index 0faaf33..d1aa840 100644
--- a/jjb/verify/xos.yaml
+++ b/jjb/verify/xos.yaml
@@ -29,12 +29,9 @@
- job-group:
name: 'verify-xos-jobs-code'
jobs:
-# - 'verify-sonarqube':
-# build-timeout: 45
- 'python-unit-test':
build-timeout: 45
build-node: 'ubuntu16.04-basebuild-2c-4g'
-# - 'synchronizer-update'
- 'api-test':
pipeline_script: 'xos-core.groovy'