diff options
24 files changed, 27 insertions, 25 deletions
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg index f3f6e4cf2..1b3d97cbb 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg @@ -1,4 +1,3 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132245.747 LABELS=centos7-builder-2c-1g HARDWARE_ID=v3-standard-2 -VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg index 469f189b6..43361f810 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg @@ -1,4 +1,3 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132245.747 LABELS=centos7-builder-4c-4g HARDWARE_ID=v3-standard-4 -VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg index c26976b26..d8ca72675 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg @@ -1,4 +1,3 @@ IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20211011-195645.572 LABELS=centos7-docker-8c-8g HARDWARE_ID=v3-standard-8 -VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg index 8bb7c0366..f72d6cc77 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg @@ -1,4 +1,3 @@ IMAGE_NAME=CentOS 7 - redis - - 50880808-8011 LABELS=centos7-redis-4c-4g HARDWARE_ID=v3-standard-4 -VOLUME_SIZE=50 diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg index 7676454ef..f0e69cdc9 100644 --- a/jenkins-config/clouds/openstack/cattle/cloud.cfg +++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg @@ -6,8 +6,7 @@ CLOUD_ZONE=ca-ymq-1 # Default Template Configuration IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132245.747 -VOLUME_SIZE=20 -HARDWARE_ID=v1-standard-1 +HARDWARE_ID=v3-standard-2 NETWORK_ID=bd089be9-e846-4afe-905b-8bb6c7c90faf USER_DATA_ID=jenkins-init-script INSTANCE_CAP=75 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 9f9d8678c..b41ed8fd1 100644 --- a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg @@ -4,4 +4,3 @@ HARDWARE_ID=v3-standard-4 INSTANCE_CAP=1 NUM_EXECUTORS=4 RETENTION_TIME=4320 -VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg index f36cf96fd..7f93e1708 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg @@ -1,4 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20210317-233509.164 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20211019-201056.707 LABELS=ubuntu1804-builder-4c-4g HARDWARE_ID=v3-standard-4 -VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg index 772004b58..38273e129 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg @@ -1,4 +1,3 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20211012-214802.084 LABELS=ubuntu1804-docker-8c-16g HARDWARE_ID=v3-standard-16 -VOLUME_SIZE=40 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg index 65d736920..93b99f81d 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg @@ -1,4 +1,3 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20211012-214802.084 LABELS=ubuntu1804-docker-8c-8g HARDWARE_ID=v3-standard-8 -VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg index cd44cbc2b..1ec526219 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg @@ -1,4 +1,3 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20210318-025845.711 LABELS=ubuntu1804-docker-arm64-4c-2g -HARDWARE_ID=lf-standard-2 -VOLUME_SIZE=20 +HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg index 47fa5e75b..8b7593ec8 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg @@ -1,4 +1,3 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20210318-025845.711 LABELS=ubuntu1804-docker-arm64-4c-4g -HARDWARE_ID=lf-standard-4 -VOLUME_SIZE=20 +HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg index 76bfc7055..b77319646 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg @@ -1,4 +1,3 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20211012-214802.084 LABELS=ubuntu1804-docker-v1-8c-8g -HARDWARE_ID=v1-standard-8 -VOLUME_SIZE=50 +HARDWARE_ID=v3-standard-8 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg index 5610c6ad1..e4aac1913 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg @@ -1,4 +1,3 @@ IMAGE_NAME=Ubuntu 18.04 - memcached - - 120780707-7003 LABELS=ubuntu1804-memcached-4c-4g HARDWARE_ID=v3-standard-4 -VOLUME_SIZE=50 diff --git a/jjb/cps/cps-cps-temporal-csit.yaml b/jjb/cps/cps-cps-temporal-csit.yaml index 1d6669b3c..1dbd0626c 100644 --- a/jjb/cps/cps-cps-temporal-csit.yaml +++ b/jjb/cps/cps-cps-temporal-csit.yaml @@ -15,8 +15,7 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'cps-cps-temporal-settings' robot-options: '' - branch: 'master' diff --git a/jjb/cps/cps-cps-temporal.yaml b/jjb/cps/cps-cps-temporal.yaml index a6172e1ad..62d9288d8 100644 --- a/jjb/cps/cps-cps-temporal.yaml +++ b/jjb/cps/cps-cps-temporal.yaml @@ -39,6 +39,8 @@ stream: - 'master': branch: master + - 'istanbul': + branch: 'istanbul' mvn-settings: cps-cps-temporal-settings files: '**' archive-artifacts: '' diff --git a/jjb/cps/cps-csit.yaml b/jjb/cps/cps-csit.yaml index 4c8a98170..6a42b61ff 100644 --- a/jjb/cps/cps-csit.yaml +++ b/jjb/cps/cps-csit.yaml @@ -17,6 +17,8 @@ branch: 'master' - 'honolulu': branch: 'honolulu' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'cps-settings' robot-options: '' branch: 'master' diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml index 780c7c168..a06036433 100644 --- a/jjb/cps/cps-ncmp-dmi-plugin.yaml +++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml @@ -41,6 +41,8 @@ stream: - 'master': branch: master + - 'istanbul': + branch: 'istanbul' mvn-settings: cps-ncmp-dmi-plugin-settings files: '**' archive-artifacts: '' diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml index cecfb790d..107b32be7 100644 --- a/jjb/cps/cps.yaml +++ b/jjb/cps/cps.yaml @@ -54,8 +54,10 @@ stream: - 'master': branch: 'master' + - 'istanbul': + branch: 'istanbul' - 'honolulu': - branch: 'honolulu' + branch: 'honolulu' mvn-settings: 'cps-settings' files: '**' archive-artifacts: '' diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index f4d2365b1..b2d8beda3 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -28,6 +28,8 @@ stream: - 'master': branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'msb-apigateway-settings' files: '**' archive-artifacts: '' diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml index 84d75c87e..72fab4ccc 100644 --- a/jjb/msb/msb-discovery.yaml +++ b/jjb/msb/msb-discovery.yaml @@ -22,6 +22,8 @@ stream: - 'master': branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'msb-discovery-settings' files: '**' archive-artifacts: '' diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml index c7bb49ba9..5c599c32a 100644 --- a/jjb/msb/msb-java-sdk.yaml +++ b/jjb/msb/msb-java-sdk.yaml @@ -13,6 +13,8 @@ stream: - 'master': branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'msb-java-sdk-settings' files: '**' archive-artifacts: '' diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml index 376cc1a47..00ac8a1e8 100644 --- a/jjb/msb/msb-swagger-sdk.yaml +++ b/jjb/msb/msb-swagger-sdk.yaml @@ -13,6 +13,8 @@ stream: - 'master': branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'msb-swagger-sdk-settings' files: '**' archive-artifacts: '' diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml index 7458a294a..8f6797c75 100644 --- a/jjb/oom/oom-helm.yaml +++ b/jjb/oom/oom-helm.yaml @@ -39,17 +39,17 @@ - "{project-name}-{stream}-verify-{helm_bin}": build_script: "{oom_build_script}" files: "**" - build-timeout: 480 + build-timeout: 600 - "{project-name}-{stream}-merge-helm": build_script: "{oom_build_script}" post_build_script: !include-raw-escape: shell/publish_helm_charts.sh files: "**" - build-timeout: 480 + build-timeout: 600 - "{project-name}-{stream}-release-helm": build_script: "{oom_build_script}" post_build_script: !include-raw-escape: shell/publish_helm_charts.sh files: "**" - build-timeout: 480 + build-timeout: 600 # Below jobs disabled until future need. - "{project-name}-{subproject}-{stream}-verify-helm2": diff --git a/packer/common-packer b/packer/common-packer -Subproject e23ebc7439c8692eff5aebf78782068ac150722 +Subproject 3dcae183d810816f31950afbe1fa08fa948e61f |