summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Yang <bin.yang@windriver.com>2019-08-13 03:50:07 +0000
committerBin Yang <bin.yang@windriver.com>2019-08-13 03:51:39 +0000
commitf5e9050adf847091d67c414bb77e4d22fa0d8514 (patch)
treef76c7fc62ca3ee2c1d74636a2977f67d98a09313
parent505a04e6c267c5216dd5f83c10acbbaabe625f35 (diff)
Add release job for multicloud services
Add release jobs for framework and opestack plugins Add info verify job for framework Descope lenovo as requried by MULTICLOUD-737 Change-Id: I1f3d7a5d36dfdd67db695eb032e541caf70f5d05 Issue-ID: MULTICLOUD-769 Signed-off-by: Bin Yang <bin.yang@windriver.com>
-rwxr-xr-xjjb/multicloud/build-multicloud-openstack-docker-image.sh4
-rw-r--r--jjb/multicloud/multicloud-framework-java.yaml2
-rw-r--r--jjb/multicloud/multicloud-framework.yaml7
-rw-r--r--jjb/multicloud/multicloud-openstack-lenovo-csit.yaml24
-rw-r--r--jjb/multicloud/multicloud-openstack.yaml44
5 files changed, 46 insertions, 35 deletions
diff --git a/jjb/multicloud/build-multicloud-openstack-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-docker-image.sh
index 5ae882847..03aab824e 100755
--- a/jjb/multicloud/build-multicloud-openstack-docker-image.sh
+++ b/jjb/multicloud/build-multicloud-openstack-docker-image.sh
@@ -9,12 +9,12 @@ chmod 755 ./ocata/docker/*.*
chmod 755 ./windriver/docker/*.*
chmod 755 ./pike/docker/*.*
chmod 755 ./starlingx/docker/*.*
-chmod 755 ./lenovo/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
-./lenovo/docker/build_image.sh
+#./lenovo/docker/build_image.sh
./fcaps/docker/build_image.sh
diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index 7a17cdb80..6fd0ccfb1 100644
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -30,6 +30,8 @@
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-builder-4c-4g
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/multicloud/multicloud-framework.yaml b/jjb/multicloud/multicloud-framework.yaml
new file mode 100644
index 000000000..859637ed2
--- /dev/null
+++ b/jjb/multicloud/multicloud-framework.yaml
@@ -0,0 +1,7 @@
+- project:
+ name: multicloud-framework-info
+ project-name: multicloud-framework
+ jobs:
+ - gerrit-info-yaml-verify
+ project: multicloud/framework
+ branch: master
diff --git a/jjb/multicloud/multicloud-openstack-lenovo-csit.yaml b/jjb/multicloud/multicloud-openstack-lenovo-csit.yaml
index b97abdae1..92f21d2c6 100644
--- a/jjb/multicloud/multicloud-openstack-lenovo-csit.yaml
+++ b/jjb/multicloud/multicloud-openstack-lenovo-csit.yaml
@@ -1,13 +1,13 @@
---
-- project:
- name: multicloud-openstack-lenovo-csit
- jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'multicloud-lenovo'
- stream: 'master'
- functionality:
- - 'functionality1':
- trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'
- robot-options: ''
- branch: 'master'
+#- project:
+# name: multicloud-openstack-lenovo-csit
+# jobs:
+# - '{project-name}-{stream}-verify-csit-{functionality}'
+# - '{project-name}-{stream}-csit-{functionality}'
+# project-name: 'multicloud-lenovo'
+# stream: 'master'
+# functionality:
+# - 'functionality1':
+# trigger_jobs: 'multicloud-openstack-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 bc73f9d3e..78611fc97 100644
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -50,14 +50,14 @@
path: 'fcaps'
pattern: 'fcaps/**'
pom: 'fcaps/pom.xml'
- - 'lenovo':
- path: 'lenovo'
- pattern: 'lenovo/**'
- pom: 'lenovo/pom.xml'
- - 'lenovo_share':
- path: 'lenovo'
- pattern: 'share/**'
- pom: 'lenovo/pom.xml'
+# - 'lenovo':
+# path: 'lenovo'
+# pattern: 'lenovo/**'
+# pom: 'lenovo/pom.xml'
+# - 'lenovo_share':
+# path: 'lenovo'
+# pattern: 'share/**'
+# pom: 'lenovo/pom.xml'
jobs:
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-{subproject}-verify-java'
@@ -73,6 +73,8 @@
maven-versions-plugin: true
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-builder-4c-4g
files: '**'
archive-artifacts: ''
build-node: 'centos7-memcached-4c-4g'
@@ -176,19 +178,19 @@
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-- project:
- name: multicloud-openstack-lenovo-sonar
- jobs:
- - gerrit-maven-sonar
- cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
- project: 'multicloud/openstack'
- project-name: 'multicloud-openstack-lenovo'
- branch: 'master'
- mvn-params: '-f lenovo/pom.xml'
- mvn-settings: 'multicloud-openstack-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+#- project:
+# name: multicloud-openstack-lenovo-sonar
+# jobs:
+# - gerrit-maven-sonar
+# cron: '@daily'
+# build-node: ubuntu1604-builder-4c-4g
+# project: 'multicloud/openstack'
+# project-name: 'multicloud-openstack-lenovo'
+# branch: 'master'
+# mvn-params: '-f lenovo/pom.xml'
+# mvn-settings: 'multicloud-openstack-settings'
+# mvn-goals: 'clean install'
+# mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- project:
name: multicloud-openstack-info