From b8fcb2594cbee90c559bfc68840ac4380c8567c7 Mon Sep 17 00:00:00 2001 From: esberglu Date: Wed, 21 Mar 2018 11:04:37 -0500 Subject: [PATCH] Update default ETCD_VERSION to latest 3.2 etcd release This updates the default ETCD_VERSION to the latest 3.2 etcd release, v3.2.17. 3.2 is chosen as it is packaged in bionic and fedora; we hope to move to packaged versions for distros that support it in due course. This version supports arm64 and ppc64le which were not supported by the previous default, v3.1.10. We have removed the override to tarballs.o.o, as these files are now cached as described in [1] [1] http://lists.openstack.org/pipermail/openstack-infra/2018-March/005871.html Depends-On: https://review.openstack.org/556688 Change-Id: I5103b4331a8d7c5660848fc148ebe4139ce6dad9 --- .zuul.yaml | 5 ----- stackrc | 10 +++++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 07d8f48cff..bbcdfef977 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -116,10 +116,6 @@ ERROR_ON_CLONE: true # Gate jobs can't deal with nested virt. Disable it. LIBVIRT_TYPE: qemu - # NOTE(dims): etcd 3.x is not available in debian/ubuntu - # etc. As a stop gap measure, devstack uses wget to download - # from the location below for all the CI jobs. - ETCD_DOWNLOAD_URL: http://tarballs.openstack.org/etcd/ devstack_services: # Ignore any default set by devstack. Emit a "disable_all_services". base: false @@ -183,7 +179,6 @@ NOVNC_FROM_PACKAGE: true ERROR_ON_CLONE: true LIBVIRT_TYPE: qemu - ETCD_DOWNLOAD_URL: http://tarballs.openstack.org/etcd/ devstack_services: base: false pre-run: playbooks/pre.yaml diff --git a/stackrc b/stackrc index e8c35f423e..9c98bc983d 100644 --- a/stackrc +++ b/stackrc @@ -737,11 +737,11 @@ fi EXTRA_CACHE_URLS="" # etcd3 defaults -ETCD_VERSION=${ETCD_VERSION:-v3.1.10} -ETCD_SHA256_AMD64=${ETCD_SHA256_AMD64:-"2d335f298619c6fb02b1124773a56966e448ad9952b26fea52909da4fe80d2be"} -# NOTE(sdague): etcd v3.1.10 doesn't have anything for these architectures, though 3.2.x does. -ETCD_SHA256_ARM64=${ETCD_SHA256_ARM64:-""} -ETCD_SHA256_PPC64=${ETCD_SHA256_PPC64:-""} +ETCD_VERSION=${ETCD_VERSION:-v3.2.17} +ETCD_SHA256_AMD64=${ETCD_SHA256_AMD64:-"0a75e794502e2e76417b19da2807a9915fa58dcbf0985e397741d570f4f305cd"} +ETCD_SHA256_ARM64=${ETCD_SHA256_ARM64:-"0ab4621c44c79d17d94e43bd184d0f23b763a3669056ce4ae2d0b2942410a98f"} +ETCD_SHA256_PPC64=${ETCD_SHA256_PPC64:-"69e1279c4a2a52256b78d2a8dd23346ac46b836e678b971a459f2afaef3c275e"} +# etcd v3.3.2 doesn't have anything for s390x ETCD_SHA256_S390X=${ETCD_SHA256_S390X:-""} # Make sure etcd3 downloads the correct architecture if is_arch "x86_64"; then