diff options
9 files changed, 11 insertions, 7 deletions
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg index 29b2cd044..ede8fe036 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190604-095324.721 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190925-225237.394 LABELS=ubuntu1604-builder-2c-1g HARDWARE_ID=v2-highcpu-2 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg index 8780f9537..6b2727b39 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190604-095324.721 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190925-225237.394 LABELS=ubuntu1604-builder-4c-2g HARDWARE_ID=v2-highcpu-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg index 4337baf58..93ccf7c87 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=Ubuntu 16.04 - basebuild - 20180319-1943 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190925-225237.394 LABELS=ubuntu1604-builder-4c-4g HARDWARE_ID=v2-highcpu-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg index a01f33692..e8dac3793 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190604-095324.721 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190925-225237.394 LABELS=ubuntu1604-builder-8c-8g HARDWARE_ID=v2-highcpu-8 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg index c36428e15..225e5c47c 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190905-215402.663 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190925-220639.261 LABELS=ubuntu1604-docker-8c-8g HARDWARE_ID=v2-highcpu-8 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg index c1d860e2b..a326f3843 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190510-225520.575 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190925-220639.261 LABELS=ubuntu1604-docker-8c-8g HARDWARE_ID=v1-standard-8 diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml index dc38c0bf2..4f6cb6ff0 100644 --- a/jjb/appc/appc-deployment.yaml +++ b/jjb/appc/appc-deployment.yaml @@ -43,6 +43,8 @@ mvn-params: '-Dmaven.test.skip=true' - 'docker-version-java-daily': mvn-params: '-Dmaven.test.skip=true' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'appc/deployment' stream: - 'master': diff --git a/jjb/dmaap/dmaap-buscontroller-csit.yaml b/jjb/dmaap/dmaap-buscontroller-csit.yaml index 85593ba22..6b4698137 100644 --- a/jjb/dmaap/dmaap-buscontroller-csit.yaml +++ b/jjb/dmaap/dmaap-buscontroller-csit.yaml @@ -6,7 +6,7 @@ - '{project-name}-{stream}-csit-{functionality}' project-name: 'dmaap-buscontroller' stream: 'master' - disabled: true + disabled: false functionality: - 'ssl': trigger_jobs: diff --git a/jjb/optf/optf-fgps.yaml b/jjb/optf/optf-fgps.yaml index b0a373b7b..9443e444d 100644 --- a/jjb/optf/optf-fgps.yaml +++ b/jjb/optf/optf-fgps.yaml @@ -20,6 +20,8 @@ sign-artifacts: true build-node: centos7-docker-8c-8g maven-versions-plugin: true + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' build-node: 'ubuntu1604-builder-4c-4g' |