3 files changed, 0 insertions, 42 deletions
diff --git a/jjb/multicloud/build-multicloud-openstack-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-docker-image.sh
index 03aab824e..8d8b72e07 100755
--- a/jjb/multicloud/build-multicloud-openstack-docker-image.sh
+++ b/jjb/multicloud/build-multicloud-openstack-docker-image.sh
@@ -5,14 +5,12 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
 CURRENTDIR="$(pwd)"
 echo $CURRENTDIR
 
-chmod 755 ./ocata/docker/*.*
 chmod 755 ./windriver/docker/*.*
 chmod 755 ./pike/docker/*.*
 chmod 755 ./starlingx/docker/*.*
 #chmod 755 ./lenovo/docker/*.*
 chmod 755 ./fcaps/docker/*.*
 
-./ocata/docker/build_image.sh
 ./windriver/docker/build_image.sh
 ./pike/docker/build_image.sh
 ./starlingx/docker/build_image.sh
diff --git a/jjb/multicloud/multicloud-openstack-ocata-csit.yaml b/jjb/multicloud/multicloud-openstack-ocata-csit.yaml
deleted file mode 100644
index d44ac3c51..000000000
--- a/jjb/multicloud/multicloud-openstack-ocata-csit.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- project:
-    name: multicloud-openstack-ocata-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'multicloud-ocata'
-    stream: 'master'
-    functionality:
-      - 'functionality1':
-          trigger_jobs:
-            - 'multicloud-openstack-master-docker-java-version-shell-daily'
-#            - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily'
-      - 'hpa-discovery':
-          trigger_jobs:
-            - 'multicloud-openstack-master-docker-java-version-shell-daily'
-#            - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'
diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index 7f11cb499..f87132498 100644
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -14,14 +14,6 @@
           branch: 'master'
     mvn-settings: 'multicloud-openstack-settings'
     subproject:
-      - 'ocata':
-          path: 'ocata'
-          pattern: 'ocata/**'
-          pom: 'ocata/pom.xml'
-      - 'ocata_share':
-          path: 'ocata'
-          pattern: 'share/**'
-          pom: 'ocata/pom.xml'
       - 'pike':
           path: 'pike'
           pattern: 'pike/**'
@@ -97,19 +89,6 @@
 #    files: '**'
 #    archive-artifacts: ''
 #
-- project:
-    name: multicloud-openstack-ocata-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'multicloud/openstack'
-    project-name: 'multicloud-openstack-ocata'
-    branch: 'master'
-    mvn-params: '-f ocata/pom.xml'
-    mvn-settings: 'multicloud-openstack-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - project:
     name: multicloud-openstack-windriver-sonar