diff options
| -rw-r--r-- | jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg | 2 | ||||
| -rw-r--r-- | jjb/oom/oom-helm.yaml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg index 3fb352b50..34f2c99f5 100644 --- a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg @@ -1,4 +1,4 @@ -IMAGE_NAME=Ubuntu 16.04 - docker - 20180101-1003 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180813-212616.934 LABELS=queue-docker-4c-4g HARDWARE_ID=v2-highcpu-4 INSTANCE_CAP=1 diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml index 003a74335..11a9ac337 100644 --- a/jjb/oom/oom-helm.yaml +++ b/jjb/oom/oom-helm.yaml @@ -75,9 +75,9 @@ build_script: 'cd kubernetes/ && make all' files: '**' - '{project-name}-{subproject}-{stream}-verify-helm': - build_script: 'cd kubernetes/ && make {subproject}' + build_script: 'cd kubernetes/ && make common && make {subproject}' - '{project-name}-{subproject}-{stream}-merge-helm': - build_script: 'cd kubernetes/ && make {subproject}' + build_script: 'cd kubernetes/ && make common && make {subproject}' - '{project-name}-{stream}-update-helm-weekly': files: '**' build_script: 'cd kubernetes/ && make all' |