X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fxtesting%2Fintegration-xtesting.yaml;h=8d9e0587fd035fbc9ded5d2ddd9efe077df18a9a;hb=627a2bfc1daf1c3b458d46a71bb714f9010cf09a;hp=7e634a11888c93e705d81284db5bfac57c727381;hpb=ee6ae9c313e0ff83f9e4e5b026596aa57808bbf4;p=ci-management.git

diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml
index 7e634a118..8d9e0587f 100644
--- a/jjb/integration/xtesting/integration-xtesting.yaml
+++ b/jjb/integration/xtesting/integration-xtesting.yaml
@@ -4,7 +4,7 @@
     project-name: integration-xtesting
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: integration/xtesting
     branch: master
 
@@ -16,6 +16,10 @@
       jobs:
           - integration-linters
       subproject:
+          - 'commit':
+                tox-dir: '.'
+                tox-envs: 'gitlint'
+                pattern: '**'
           - 'yaml':
                 tox-dir: '.'
                 tox-envs: 'yaml'
@@ -35,11 +39,15 @@
       stream:
           - 'master':
                 branch: 'master'
+          - 'jakarta':
+                branch: 'jakarta'
+          - 'kohn':
+                branch: 'kohn'
 
 - project:
     name: integration-xtesting-release
     project-name: 'integration-xtesting'
-    project: 'integration/docker/onap-python'
+    project: 'integration/xtesting'
     mvn-settings: 'integration-settings'
     jobs:
       - '{project-name}-gerrit-release-jobs':
@@ -88,26 +96,6 @@
           docker-root: ./smoke-usecases-robot
           docker-name: 'onap/xtesting-smoke-usecases-robot'
           docker-build-args: '-f ./docker/Dockerfile'
-      - gerrit-docker-verify:
-          project-name: 'integration-xtesting-benchmarking'
-          docker-root: ./benchmarking
-          docker-name: 'onap/xtesting-benchmarking'
-          docker-build-args: '-f ./docker/Dockerfile'
-      - gerrit-docker-merge:
-          project-name: 'integration-xtesting-benchmarking'
-          docker-root: ./benchmarking
-          docker-name: 'onap/xtesting-benchmarking'
-          docker-build-args: '-f ./docker/Dockerfile'
-      - gerrit-docker-verify:
-          project-name: 'integration-xtesting-candidate-usecases'
-          docker-root: ./candidate-usecases
-          docker-name: 'onap/xtesting-candidate-usecases'
-          docker-build-args: '-f ./docker/Dockerfile'
-      - gerrit-docker-merge:
-          project-name: 'integration-xtesting-candidate-usecases'
-          docker-root: ./candidate-usecases
-          docker-name: 'onap/xtesting-candidate-usecases'
-          docker-build-args: '-f ./docker/Dockerfile'
       - gerrit-docker-verify:
           project-name: 'integration-xtesting-security'
           docker-root: ./security
@@ -118,15 +106,29 @@
           docker-root: ./security
           docker-name: 'onap/xtesting-security'
           docker-build-args: '-f ./docker/Dockerfile'
+      - gerrit-docker-verify:
+          project-name: 'integration-xtesting-smoke-usecases-robot-py3'
+          docker-root: ./smoke-usecases-robot-py3
+          docker-name: 'onap/xtesting-smoke-usecases-robot-py3'
+          docker-build-args: '-f ./docker/Dockerfile'
+      - gerrit-docker-merge:
+          project-name: 'integration-xtesting-smoke-usecases-robot-py3'
+          docker-root: ./smoke-usecases-robot-py3
+          docker-name: 'onap/xtesting-smoke-usecases-robot-py3'
+          docker-build-args: '-f ./docker/Dockerfile'
     project: 'integration/xtesting'
     stream:
       - 'master':
             branch: 'master'
             files: ''
-      - 'frankfurt':
-            branch: 'frankfurt'
+      - 'jakarta':
+            branch: 'jakarta'
+            files: ''
+      - 'kohn':
+            branch: 'kohn'
             files: ''
     docker-root: '$WORKSPACE'
     mvn-settings: 'integration-settings'
     build-node: ubuntu1804-docker-8c-8g
     cron: '@daily'
+    container-tag-method: stream