X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fxtesting%2Fintegration-xtesting.yaml;h=97e9129512c74457047acd2d5aabf2ac2e56b0e6;hb=a29dd524cc61ad4692b5ba0fee58c2276ffa0917;hp=8544cad555d2f2927817afdcfee4d69a8fef2c90;hpb=386dbd8331c30762ff85bdfdd4b5fb5acfc62e9e;p=ci-management.git

diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml
index 8544cad55..97e912951 100644
--- a/jjb/integration/xtesting/integration-xtesting.yaml
+++ b/jjb/integration/xtesting/integration-xtesting.yaml
@@ -1,131 +1,125 @@
 ---
 - project:
-    name: integration-xtesting-info
+    name: integration-xtesting-linters
+    project: integration/xtesting
     project-name: integration-xtesting
+    python-version: python3
     jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: integration/xtesting
-    branch: master
-
-- project:
-      name: integration-xtesting-linters
-      project: integration/xtesting
-      project-name: integration-xtesting
-      python-version: python3
-      jobs:
-          - integration-linters
-      subproject:
-          - 'yaml':
-                tox-dir: '.'
-                tox-envs: 'yaml'
-                pattern: '**/*.yaml'
-          - 'yml':
-                tox-dir: '.'
-                tox-envs: 'yaml'
-                pattern: '**/*.yml'
-          - 'json':
-                tox-dir: '.'
-                tox-envs: 'json'
-                pattern: '**/*.json'
-          - 'md':
-              tox-dir: '.'
-              tox-envs: 'md'
-              pattern: '**/*.md'
-      stream:
-          - 'master':
-                branch: 'master'
+      - integration-linters
+    subproject:
+      - "commit":
+          tox-dir: "."
+          tox-envs: "gitlint"
+          pattern: "**"
+      - "yaml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yaml"
+      - "yml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yml"
+      - "json":
+          tox-dir: "."
+          tox-envs: "json"
+          pattern: "**/*.json"
+      - "md":
+          tox-dir: "."
+          tox-envs: "md"
+          pattern: "**/*.md"
+    stream:
+      - "master":
+          branch: "master"
+      - "london":
+          branch: "london"
+      - "kohn":
+          branch: "kohn"
 
 - project:
     name: integration-xtesting-release
-    project-name: 'integration-xtesting'
-    project: 'integration/docker/onap-python'
-    mvn-settings: 'integration-settings'
+    project-name: "integration-xtesting"
+    project: "integration/xtesting"
+    mvn-settings: "integration-settings"
     jobs:
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
 
 - project:
-    name: 'integration-xtesting-docker'
+    name: "integration-xtesting-docker"
     jobs:
       - gerrit-docker-verify:
-          project-name: 'integration-xtesting-infra-healthcheck'
+          project-name: "integration-xtesting-infra-healthcheck"
           docker-root: ./infra-healthcheck
-          docker-name: 'onap/xtesting-infra-healthcheck'
-          docker-build-args: '-f ./docker/Dockerfile'
+          docker-name: "onap/xtesting-infra-healthcheck"
+          docker-build-args: "-f ./docker/Dockerfile"
       - gerrit-docker-merge:
-          project-name: 'integration-xtesting-infra-healthcheck'
+          project-name: "integration-xtesting-infra-healthcheck"
           docker-root: ./infra-healthcheck
-          docker-name: 'onap/xtesting-infra-healthcheck'
-          docker-build-args: '-f ./docker/Dockerfile'
+          docker-name: "onap/xtesting-infra-healthcheck"
+          docker-build-args: "-f ./docker/Dockerfile"
       - gerrit-docker-verify:
-          project-name: 'integration-xtesting-healthcheck'
+          project-name: "integration-xtesting-healthcheck"
           docker-root: ./healthcheck
-          docker-name: 'onap/xtesting-healthcheck'
-          docker-build-args: '-f ./docker/Dockerfile'
+          docker-name: "onap/xtesting-healthcheck"
+          docker-build-args: "-f ./docker/Dockerfile"
       - gerrit-docker-merge:
-          project-name: 'integration-xtesting-healthcheck'
+          project-name: "integration-xtesting-healthcheck"
           docker-root: ./healthcheck
-          docker-name: 'onap/xtesting-healthcheck'
-          docker-build-args: '-f ./docker/Dockerfile'
+          docker-name: "onap/xtesting-healthcheck"
+          docker-build-args: "-f ./docker/Dockerfile"
       - gerrit-docker-verify:
-          project-name: 'integration-xtesting-smoke-usecases-pythonsdk'
+          project-name: "integration-xtesting-smoke-usecases-pythonsdk"
           docker-root: ./smoke-usecases-pythonsdk
-          docker-name: 'onap/xtesting-smoke-usecases-pythonsdk'
-          docker-build-args: '-f ./docker/Dockerfile'
+          docker-name: "onap/xtesting-smoke-usecases-pythonsdk"
+          docker-build-args: "-f ./docker/Dockerfile"
       - gerrit-docker-merge:
-          project-name: 'integration-xtesting-smoke-usecases-pythonsdk'
+          project-name: "integration-xtesting-smoke-usecases-pythonsdk"
           docker-root: ./smoke-usecases-pythonsdk
-          docker-name: 'onap/xtesting-smoke-usecases-pythonsdk'
-          docker-build-args: '-f ./docker/Dockerfile'
+          docker-name: "onap/xtesting-smoke-usecases-pythonsdk"
+          docker-build-args: "-f ./docker/Dockerfile"
       - gerrit-docker-verify:
-          project-name: 'integration-xtesting-smoke-usecases-robot'
+          project-name: "integration-xtesting-smoke-usecases-robot"
           docker-root: ./smoke-usecases-robot
-          docker-name: 'onap/xtesting-smoke-usecases-robot'
-          docker-build-args: '-f ./docker/Dockerfile'
+          docker-name: "onap/xtesting-smoke-usecases-robot"
+          docker-build-args: "-f ./docker/Dockerfile"
       - gerrit-docker-merge:
-          project-name: 'integration-xtesting-smoke-usecases-robot'
+          project-name: "integration-xtesting-smoke-usecases-robot"
           docker-root: ./smoke-usecases-robot
-          docker-name: 'onap/xtesting-smoke-usecases-robot'
-          docker-build-args: '-f ./docker/Dockerfile'
+          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'
+          project-name: "integration-xtesting-security"
           docker-root: ./security
-          docker-name: 'onap/xtesting-security'
-          docker-build-args: '-f ./docker/Dockerfile'
+          docker-name: "onap/xtesting-security"
+          docker-build-args: "-f ./docker/Dockerfile"
       - gerrit-docker-merge:
-          project-name: 'integration-xtesting-security'
+          project-name: "integration-xtesting-security"
           docker-root: ./security
-          docker-name: 'onap/xtesting-security'
-          docker-build-args: '-f ./docker/Dockerfile'
-    project: 'integration/xtesting'
+          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'
-            files: ''
-    docker-root: '$WORKSPACE'
-    mvn-settings: 'integration-settings'
+      - "master":
+          branch: "master"
+          files: ""
+      - "london":
+          branch: "london"
+          files: ""
+      - "kohn":
+          branch: "kohn"
+          files: ""
+    docker-root: "$WORKSPACE"
+    mvn-settings: "integration-settings"
     build-node: ubuntu1804-docker-8c-8g
+    cron: "@daily"
+    container-tag-method: stream