Merge "Change parent daily jobs"
diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml
index 574e17e..b758ba5 100644
--- a/jjb/externalapi/externalapi-nbi.yaml
+++ b/jjb/externalapi/externalapi-nbi.yaml
@@ -22,6 +22,8 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-params: '-Dmaven.test.skip=true -P docker'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-builder-4c-4g
project: 'externalapi/nbi'
stream:
- 'master':
diff --git a/jjb/multicloud/build-multicloud-openstack-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-docker-image.sh
index 5ae8828..03aab82 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 ./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 7a17cdb..6fd0ccf 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 0000000..859637e
--- /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 b97abda..92f21d2 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 bc73f9d..78611fc 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
diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml
index 27762f9..ef69fbc 100644
--- a/jjb/vfc/vfc-nfvo-catalog.yaml
+++ b/jjb/vfc/vfc-nfvo-catalog.yaml
@@ -26,6 +26,8 @@
script:
!include-raw-escape: 'build-nfvo-catalog-docker-image.sh'
build-node: ubuntu1604-docker-8c-8g
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-builder-4c-4g
files: '**'
archive-artifacts: ''
build-node: centos7-redis-4c-4g