Merge "Migrate multicloud framework docker job"

diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 95de71c..50f042d 100644 (file)
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -15,18 +15,10 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: 'ubuntu1604-docker-8c-8g'
     project: 'logging-analytics'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'logging-analytics-settings'
     files: '**'
     archive-artifacts: ''
@@ -82,7 +74,6 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g

diff --git a/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh
deleted file mode 100755 (executable)
index bdb5a84..0000000
--- a/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-#
-echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
-
-CURRENTDIR="$(pwd)"
-echo $CURRENTDIR
-
-echo '========================== Building docker for vesagent =========================='
-chmod 755 ./vesagent/docker/*.*
-./vesagent/docker/docker-build.sh

diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
deleted file mode 100644 (file)
index 0066522..0000000
--- a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
----
-- project:
-    name: multicloud-openstack-vmware-vesagent-java
-    project-name: 'multicloud-openstack-vmware-vesagent'
-    project: 'multicloud/openstack/vmware'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'multicloud-openstack-vmware-settings'
-    subproject:
-      - 'vesagent':
-          pom: 'vesagent/pom.xml'
-          pattern: 'vesagent/**'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-openstack-vmware-vesagent-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-#- project:
-#    name: multicloud-openstack-vmware-vesagent-arm64-java
-#    project-name: 'multicloud-openstack-vmware-vesagent-arm64'
-#    project: 'multicloud/openstack/vmware'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'multicloud-openstack-vmware-settings'
-#    subproject:
-#      - 'vesagent':
-#          pom: 'vesagent/pom.xml'
-#          pattern: 'vesagent/**'
-#    jobs:
-#      - '{project-name}-{stream}-docker-java-version-shell-daily':
-#          docker-pom: 'pom.xml'
-#          mvn-goals: 'install'
-#          script:
-#            !include-raw-escape: 'build-multicloud-openstack-vmware-vesagent-docker-image.sh'
-#          build-node: ubuntu1604-docker-arm64-4c-2g
-#    files: '**'
-#    archive-artifacts: ''

diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml
deleted file mode 100644 (file)
index ca22904..0000000
--- a/jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- project:
-    name: multicloud-openstack-vmware-vesagent-python
-    project-name: 'multicloud-openstack-vmware-vesagent'
-    project: 'multicloud/openstack/vmware'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'multicloud-openstack-vmware-settings'
-    build-node: 'ubuntu1604-builder-4c-4g'
-    subproject:
-      - 'vesagent':
-          path: 'vesagent'
-          pattern: 'vesagent/**'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'