Migrate ubuntu jobs from Xenial to Bionic

This patch set is based on [0] that also fixed up a handful of Bionic-
specific changes required for the gates to pass.

[0] https://review.openstack.org/#/c/649698/

Co-Authored-By: ghanshyam <gmann@ghanshyammann.com>

Change-Id: I217a27c53eec2a51ddbea7226a23042558c5946b
This commit is contained in:
Tin Lam 2019-04-06 14:44:34 -05:00 committed by Pete Birley
parent 1a3788ddf1
commit 752bbf48c4
6 changed files with 18 additions and 21 deletions

View File

@ -60,7 +60,7 @@
vars: vars:
packages: packages:
deb: deb:
- docker.io=18.06.1-0ubuntu1.2~16.04.1 - docker.io=18.06.1-0ubuntu1.2~18.04.1
rpm: rpm:
- docker - docker

View File

@ -57,14 +57,14 @@ sudo sed -i '/^127.0.0.1/c\127.0.0.1 localhost localhost.localdomain localhost4l
sudo sed -i '/^::1/c\::1 localhost6 localhost6.localdomain6' /etc/hosts sudo sed -i '/^::1/c\::1 localhost6 localhost6.localdomain6' /etc/hosts
# Install required packages for K8s on host # Install required packages for K8s on host
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv 460F3994 wget -q -O- 'https://download.ceph.com/keys/release.asc' | sudo apt-key add -
RELEASE_NAME=$(grep 'CODENAME' /etc/lsb-release | awk -F= '{print $2}') RELEASE_NAME=$(grep 'CODENAME' /etc/lsb-release | awk -F= '{print $2}')
sudo add-apt-repository "deb https://download.ceph.com/debian-mimic/ sudo add-apt-repository "deb https://download.ceph.com/debian-mimic/
${RELEASE_NAME} main" ${RELEASE_NAME} main"
sudo -E apt-get update sudo -E apt-get update
# NOTE(srwilkers): Pin docker version to validated docker version for k8s 1.12.2 # NOTE(srwilkers): Pin docker version to validated docker version for k8s 1.12.2
sudo -E apt-get install -y \ sudo -E apt-get install -y \
docker.io=18.06.1-0ubuntu1.2~16.04.1 \ docker.io=18.06.1-0ubuntu1.2~18.04.1 \
socat \ socat \
jq \ jq \
util-linux \ util-linux \
@ -72,7 +72,7 @@ sudo -E apt-get install -y \
rbd-nbd \ rbd-nbd \
nfs-common \ nfs-common \
bridge-utils \ bridge-utils \
libxtables11 libxtables12
sudo -E tee /etc/modprobe.d/rbd.conf << EOF sudo -E tee /etc/modprobe.d/rbd.conf << EOF
install rbd /bin/true install rbd /bin/true

View File

@ -14,11 +14,8 @@
when: kubelet.pv_support_ceph when: kubelet.pv_support_ceph
block: block:
- name: ubuntu | ensure community ceph repository key is installed - name: ubuntu | ensure community ceph repository key is installed
when: ansible_distribution == 'Ubuntu' when: ansible_distribution == "Ubuntu"
apt_key: shell: wget -q -O- 'https://download.ceph.com/keys/release.asc' | sudo apt-key add -
id: "460F3994"
keyserver: "keyserver.ubuntu.com"
state: present
- name: ubuntu | ensure community ceph repository exists - name: ubuntu | ensure community ceph repository exists
when: ansible_distribution == 'Ubuntu' when: ansible_distribution == 'Ubuntu'

View File

@ -16,7 +16,7 @@
- job: - job:
name: openstack-helm-lint name: openstack-helm-lint
run: zuul.d/playbooks/lint.yml run: zuul.d/playbooks/lint.yml
nodeset: ubuntu-xenial nodeset: ubuntu-bionic
- job: - job:
name: openstack-helm-infra-functional name: openstack-helm-infra-functional

View File

@ -17,7 +17,7 @@
name: openstack-helm-single-node name: openstack-helm-single-node
nodes: nodes:
- name: primary - name: primary
label: ubuntu-xenial label: ubuntu-bionic
groups: groups:
- name: primary - name: primary
nodes: nodes:
@ -27,11 +27,11 @@
name: openstack-helm-ubuntu name: openstack-helm-ubuntu
nodes: nodes:
- name: primary - name: primary
label: ubuntu-xenial label: ubuntu-bionic
- name: node-1 - name: node-1
label: ubuntu-xenial label: ubuntu-bionic
- name: node-2 - name: node-2
label: ubuntu-xenial label: ubuntu-bionic
groups: groups:
- name: primary - name: primary
nodes: nodes:
@ -82,15 +82,15 @@
name: openstack-helm-five-node-ubuntu name: openstack-helm-five-node-ubuntu
nodes: nodes:
- name: primary - name: primary
label: ubuntu-xenial label: ubuntu-bionic
- name: node-1 - name: node-1
label: ubuntu-xenial label: ubuntu-bionic
- name: node-2 - name: node-2
label: ubuntu-xenial label: ubuntu-bionic
- name: node-3 - name: node-3
label: ubuntu-xenial label: ubuntu-bionic
- name: node-4 - name: node-4
label: ubuntu-xenial label: ubuntu-bionic
groups: groups:
- name: primary - name: primary
nodes: nodes:

View File

@ -49,9 +49,9 @@
- openstack-helm-infra-armada-update-passwords - openstack-helm-infra-armada-update-passwords
experimental: experimental:
jobs: jobs:
#NOTE(srwilkers): Disable fedora experimental jobs until issues resolved # NOTE(srwilkers): Disable fedora experimental jobs until issues resolved
#- openstack-helm-infra-five-fedora #- openstack-helm-infra-five-fedora
#NOTE(srwilkers): Disable centos experimental jobs until issues resolved # NOTE(srwilkers): Disable centos experimental jobs until issues resolved
#- openstack-helm-infra-five-centos #- openstack-helm-infra-five-centos
- openstack-helm-infra-tenant-ceph - openstack-helm-infra-tenant-ceph
- openstack-helm-infra-elastic-beats - openstack-helm-infra-elastic-beats