Merge "[XTESTING] fix bad project name in jjb"

[ci-management.git] / jjb / integration / xtesting / integration-xtesting.yaml

diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml
index 2065813..6d2c882 100644 (file)
--- a/jjb/integration/xtesting/integration-xtesting.yaml
+++ b/jjb/integration/xtesting/integration-xtesting.yaml
@@ -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'
+          - 'frankfurt':
+                branch: 'frankfurt'
+          - 'guilin':
+                branch: 'guilin'
 
 - 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
@@ -123,6 +111,14 @@
       - 'master':
             branch: 'master'
             files: ''
+      - 'guilin':
+            branch: 'guilin'
+            files: ''
+      - 'develop':
+            branch: 'develop'
+            files: ''
     docker-root: '$WORKSPACE'
     mvn-settings: 'integration-settings'
     build-node: ubuntu1804-docker-8c-8g
+    cron: '@daily'
+    container-tag-method: stream