Merge "Clean CSIT jjbs"

17 files changed, 14 insertions, 22 deletions

diff --git a/jjb/aai/aai-csit.yaml b/jjb/aai/aai-csit.yaml
index 4e9c16c44..0b3abdfff 100644
--- a/jjb/aai/aai-csit.yaml
+++ b/jjb/aai/aai-csit.yaml
@@ -5,6 +5,7 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'aai'
+    disabled: true
     stream:
       - 'master':
           branch: master
@@ -16,4 +17,3 @@
       - 'esr-server':
           trigger_jobs: 'aai-esr-server-{stream}-docker-java-daily'
     robot-options: ''
-
diff --git a/jjb/clamp/clamp-csit.yaml b/jjb/clamp/clamp-csit.yaml
index 3c2579301..63b6e80f9 100644
--- a/jjb/clamp/clamp-csit.yaml
+++ b/jjb/clamp/clamp-csit.yaml
@@ -8,8 +8,6 @@
     stream:
         - 'master':
               branch: 'master'
-        - 'dublin':
-              branch: 'dublin'
     functionality:
       - 'APIs':
           trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
diff --git a/jjb/cli/cli-csit.yaml b/jjb/cli/cli-csit.yaml
index 48d1151ef..7438b8689 100644
--- a/jjb/cli/cli-csit.yaml
+++ b/jjb/cli/cli-csit.yaml
@@ -5,6 +5,7 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'cli'
+    disabled: true
     stream:
       - 'master':
           branch: 'master'
diff --git a/jjb/dmaap/dmaap-buscontroller-csit.yaml b/jjb/dmaap/dmaap-buscontroller-csit.yaml
index 1ba6d5d58..85593ba22 100644
--- a/jjb/dmaap/dmaap-buscontroller-csit.yaml
+++ b/jjb/dmaap/dmaap-buscontroller-csit.yaml
@@ -6,6 +6,7 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'dmaap-buscontroller'
     stream: 'master'
+    disabled: true
     functionality:
       - 'ssl':
           trigger_jobs:
diff --git a/jjb/holmes/holmes-csit.yaml b/jjb/holmes/holmes-csit.yaml
index 9d2323aaf..bf7e768a9 100644
--- a/jjb/holmes/holmes-csit.yaml
+++ b/jjb/holmes/holmes-csit.yaml
@@ -6,6 +6,7 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'holmes-rule-management'
     stream: 'master'
+    disabled: true
     functionality:
       - 'sanity-check':
           trigger_jobs: 'holmes-rule-management-master-docker-java-daily'
diff --git a/jjb/modeling/modeling-etsicatalog-csit.yaml b/jjb/modeling/modeling-etsicatalog-csit.yaml
deleted file mode 100644
index 76ebd4f20..000000000
--- a/jjb/modeling/modeling-etsicatalog-csit.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- project:
-    name: modeling-etsicatalog-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'modeling-etsicatalog'
-    stream: 'master'
-    functionality:
-      - 'sanity-check':
-          trigger_jobs: 'modeling-etsicatalog-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'
\ No newline at end of file
diff --git a/jjb/msb/msb-csit.yaml b/jjb/msb/msb-csit.yaml
index bdb16ab4a..42a665727 100644
--- a/jjb/msb/msb-csit.yaml
+++ b/jjb/msb/msb-csit.yaml
@@ -6,6 +6,7 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'msb'
     stream: 'master'
+    disabled: true
     functionality:
       - 'sanity-check':
           trigger_jobs:
diff --git a/jjb/multicloud/multicloud-azure-csit.yaml b/jjb/multicloud/multicloud-azure-csit.yaml
index 10946318a..3deb163b9 100644
--- a/jjb/multicloud/multicloud-azure-csit.yaml
+++ b/jjb/multicloud/multicloud-azure-csit.yaml
@@ -6,6 +6,7 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'multicloud-azure'
     stream: 'master'
+    disabled: true
     functionality:
       - 'functionality1':
           trigger_jobs: 'multicloud-azure-master-docker-java-version-shell-daily'
diff --git a/jjb/multicloud/multicloud-k8s-csit.yaml b/jjb/multicloud/multicloud-k8s-csit.yaml
index a5a1540e7..84072303c 100644
--- a/jjb/multicloud/multicloud-k8s-csit.yaml
+++ b/jjb/multicloud/multicloud-k8s-csit.yaml
@@ -6,6 +6,7 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'multicloud-k8s'
     stream: 'master'
+    disabled: true
     functionality:
       - 'functionality1':
           trigger_jobs: 'multicloud-k8s-master-docker-golang-shell-daily'
diff --git a/jjb/multicloud/multicloud-openstack-pike-csit.yaml b/jjb/multicloud/multicloud-openstack-pike-csit.yaml
index 2e3685680..180114a90 100644
--- a/jjb/multicloud/multicloud-openstack-pike-csit.yaml
+++ b/jjb/multicloud/multicloud-openstack-pike-csit.yaml
@@ -6,6 +6,7 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'multicloud-pike'
     stream: 'master'
+    disabled: true
     functionality:
       - 'functionality1':
           trigger_jobs:
diff --git a/jjb/multicloud/multicloud-openstack-windriver-csit.yaml b/jjb/multicloud/multicloud-openstack-windriver-csit.yaml
index fa8dfd454..c24627634 100644
--- a/jjb/multicloud/multicloud-openstack-windriver-csit.yaml
+++ b/jjb/multicloud/multicloud-openstack-windriver-csit.yaml
@@ -5,6 +5,7 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'multicloud-windriver'
     stream: 'master'
+    disabled: true
     functionality:
       - 'functionality1':
           trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'
diff --git a/jjb/music/music-csit.yaml b/jjb/music/music-csit.yaml
index a0dbc8184..c0299f6d2 100644
--- a/jjb/music/music-csit.yaml
+++ b/jjb/music/music-csit.yaml
@@ -5,11 +5,10 @@
        - '{project-name}-{stream}-verify-csit-{functionality}'
        - '{project-name}-{stream}-csit-{functionality}'
      project-name: 'music'
+     disabled: true
      stream: 'master'
      functionality:
        - 'music-test-plan':
            trigger_jobs: 'music-master-docker-version-java-daily'
      robot-options: ''
      branch: 'master'
-
-
diff --git a/jjb/optf/optf-cmso-csit.yaml b/jjb/optf/optf-cmso-csit.yaml
index ae0a790e5..4bf51652f 100644
--- a/jjb/optf/optf-cmso-csit.yaml
+++ b/jjb/optf/optf-cmso-csit.yaml
@@ -8,8 +8,6 @@
      stream:
        - 'master':
            branch: master
-       - 'dublin':
-           branch: dublin
      functionality:
        - 'cmso':
            trigger_jobs: 'optf-cmso-master-docker-java-version-shell-daily'
diff --git a/jjb/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml
index 498878638..57bc512b2 100644
--- a/jjb/optf/optf-has-csit.yaml
+++ b/jjb/optf/optf-has-csit.yaml
@@ -5,6 +5,7 @@
        - '{project-name}-{stream}-verify-csit-{functionality}'
        - '{project-name}-{stream}-csit-{functionality}'
      project-name: 'optf-has'
+     disabled: true
      stream:
        - 'master':
            branch: master
diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml
index bb31f31dc..426186778 100644
--- a/jjb/optf/optf-osdf-csit.yaml
+++ b/jjb/optf/optf-osdf-csit.yaml
@@ -5,11 +5,10 @@
        - '{project-name}-{stream}-verify-csit-{functionality}'
        - '{project-name}-{stream}-csit-{functionality}'
      project-name: 'optf-osdf'
+     disabled: true
      stream:
        - 'master':
            branch: master
-       - 'dublin':
-           branch: dublin
      functionality:
        - 'osdf':
            trigger_jobs: 'optf-osdf-master-osdf-docker-java-version-shell-daily'
diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml
index 93cbf9fc9..a0679bbd5 100644
--- a/jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml
+++ b/jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml
@@ -5,6 +5,7 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'vnfsdk-pkgtools'
+    disabled: true
     stream: 'master'
     functionality:
       - 'sanity-check':
diff --git a/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml
index e34fd7403..9ff4e8509 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml
@@ -6,6 +6,7 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'vnfsdk-refrepo'
     stream: 'master'
+    disabled: true
     functionality:
       - 'sanity-check':
           trigger_jobs: '{project-name}-{stream}-merge-java'