Merge "Move CSIT to integration/csit repo"

diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml
index 07b6473..be7e1f7 100644 (file)
--- a/jjb/appc/appc-cdt.yaml
+++ b/jjb/appc/appc-cdt.yaml
@@ -12,8 +12,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'appc-cdt-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index 81dc8f4..040913b 100644 (file)
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -14,8 +14,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'appc-deployment-settings'
     files: '**'
     archive-artifacts: ''
@@ -33,8 +31,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'appc-deployment-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index b326228..2384fc9 100644 (file)
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -18,8 +18,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'appc-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml
new file mode 100644 (file)
index 0000000..eada89d
--- /dev/null
+++ b/jjb/optf/optf-osdf-csit.yaml
@@ -0,0 +1,17 @@
+---
+- project:
+     name: optf-osdf-csit
+     jobs:
+       - '{project-name}-{stream}-verify-csit-{functionality}'
+       - '{project-name}-{stream}-csit-{functionality}'
+     project-name: 'optf-osdf'
+     stream:
+       - 'master':
+           branch: master
+       - 'beijing':
+           branch: beijing
+     functionality:
+       - 'osdf':
+           trigger_jobs: 'optf-osdf-master-osdf-docker-java-version-shell-daily'
+     robot-options: ''
+     branch: 'master'

diff --git a/jjb/usecases/5G-bulkpm.yaml b/jjb/usecases/5G-bulkpm.yaml
new file mode 100644 (file)
index 0000000..8ef0fdc
--- /dev/null
+++ b/jjb/usecases/5G-bulkpm.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: usecases-5G-bulkpm-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'usecases'
+    stream: 'master'
+    functionality:
+      - '5G-bulkpm':
+          trigger_jobs:
+            - '{project-name}-{stream}-docker-java-shell-daily'
+    robot-options: ''
+    branch: 'master'