Ubuntu: Switch to Focal and Victoria
We already have OpenStack Victoria releae available in cloud archive so let's switch our master tests to that latest version. Since Victoria release is only available in Focal this change also switch base Ubuntu version from Bionic to Focal. Change-Id: Ie78b6ef1c3f09fbbc3bc584ac99d2a0acfc5d9d9
This commit is contained in:
parent
5a12e3b187
commit
fe029254fd
@ -194,10 +194,7 @@ install_puppet() {
|
|||||||
print_header 'Setup (Debian based)'
|
print_header 'Setup (Debian based)'
|
||||||
if [ "${MANAGE_REPOS}" == "true" ] ; then
|
if [ "${MANAGE_REPOS}" == "true" ] ; then
|
||||||
PUPPET_CODENAME=$(lsb_release -s -c)
|
PUPPET_CODENAME=$(lsb_release -s -c)
|
||||||
if [ $PUPPET_CODENAME == "bionic" ]; then
|
|
||||||
# For some reason this directory does not exist in Bionic
|
|
||||||
$SUDO mkdir -p /etc/apt/sources.list.d
|
$SUDO mkdir -p /etc/apt/sources.list.d
|
||||||
fi
|
|
||||||
echo "deb ${NODEPOOL_PUPPETLABS_MIRROR} ${PUPPET_CODENAME} puppet${PUPPET_MAJ_VERSION}" | $SUDO tee /etc/apt/sources.list.d/puppetlabs.list
|
echo "deb ${NODEPOOL_PUPPETLABS_MIRROR} ${PUPPET_CODENAME} puppet${PUPPET_MAJ_VERSION}" | $SUDO tee /etc/apt/sources.list.d/puppetlabs.list
|
||||||
$SUDO apt-key add files/GPG-KEY-puppetlabs
|
$SUDO apt-key add files/GPG-KEY-puppetlabs
|
||||||
$SUDO apt-key add files/GPG-KEY-ceph
|
$SUDO apt-key add files/GPG-KEY-ceph
|
||||||
|
@ -12,7 +12,7 @@ class openstack_integration::repos {
|
|||||||
'ubuntu': {
|
'ubuntu': {
|
||||||
include apt
|
include apt
|
||||||
class { 'openstack_extras::repo::debian::ubuntu':
|
class { 'openstack_extras::repo::debian::ubuntu':
|
||||||
release => 'ussuri',
|
release => 'victoria',
|
||||||
package_require => true,
|
package_require => true,
|
||||||
uca_location => pick($::uca_mirror_host, 'http://ubuntu-cloud.archive.canonical.com/ubuntu'),
|
uca_location => pick($::uca_mirror_host, 'http://ubuntu-cloud.archive.canonical.com/ubuntu'),
|
||||||
}
|
}
|
||||||
|
@ -197,7 +197,7 @@ class openstack_integration::tempest (
|
|||||||
# Install missed dependency for neutron tests
|
# Install missed dependency for neutron tests
|
||||||
# https://github.com/openstack/neutron/blob/master/test-requirements.txt#L20
|
# https://github.com/openstack/neutron/blob/master/test-requirements.txt#L20
|
||||||
if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) {
|
if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) {
|
||||||
package { ['python-ddt', 'python-oslotest', 'python-gabbi']:
|
package { ['python3-ddt', 'python3-oslotest', 'python3-gabbi']:
|
||||||
ensure => present
|
ensure => present
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -83,7 +83,7 @@
|
|||||||
name: puppet-openstack-base
|
name: puppet-openstack-base
|
||||||
pre-run: playbooks/prepare-node-common.yaml
|
pre-run: playbooks/prepare-node-common.yaml
|
||||||
abstract: true
|
abstract: true
|
||||||
nodeset: ubuntu-bionic
|
nodeset: ubuntu-focal
|
||||||
vars:
|
vars:
|
||||||
puppet: 6
|
puppet: 6
|
||||||
use_puppetlabs: false
|
use_puppetlabs: false
|
||||||
|
@ -15,9 +15,9 @@
|
|||||||
ceph: nautilus
|
ceph: nautilus
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic
|
name: puppet-openstack-integration-6-scenario001-tempest-ubuntu-focal
|
||||||
parent: puppet-openstack-integration-6-scenario001
|
parent: puppet-openstack-integration-6-scenario001
|
||||||
nodeset: ubuntu-bionic
|
nodeset: ubuntu-focal
|
||||||
voting: false
|
voting: false
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
@ -40,9 +40,9 @@
|
|||||||
scenario: scenario002
|
scenario: scenario002
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
|
name: puppet-openstack-integration-6-scenario002-tempest-ubuntu-focal
|
||||||
parent: puppet-openstack-integration-6-scenario002
|
parent: puppet-openstack-integration-6-scenario002
|
||||||
nodeset: ubuntu-bionic
|
nodeset: ubuntu-focal
|
||||||
voting: false
|
voting: false
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
@ -65,9 +65,9 @@
|
|||||||
scenario: scenario003
|
scenario: scenario003
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic
|
name: puppet-openstack-integration-6-scenario003-tempest-ubuntu-focal
|
||||||
parent: puppet-openstack-integration-6-scenario003
|
parent: puppet-openstack-integration-6-scenario003
|
||||||
nodeset: ubuntu-bionic
|
nodeset: ubuntu-focal
|
||||||
voting: false
|
voting: false
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
@ -91,9 +91,9 @@
|
|||||||
ceph: nautilus
|
ceph: nautilus
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic
|
name: puppet-openstack-integration-6-scenario004-tempest-ubuntu-focal
|
||||||
parent: puppet-openstack-integration-6-scenario004
|
parent: puppet-openstack-integration-6-scenario004
|
||||||
nodeset: ubuntu-bionic
|
nodeset: ubuntu-focal
|
||||||
voting: false
|
voting: false
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
|
@ -7,12 +7,12 @@
|
|||||||
name: puppet-openstack-check-jobs
|
name: puppet-openstack-check-jobs
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- puppet-openstack-lint-ubuntu-bionic
|
- puppet-openstack-lint-ubuntu-focal
|
||||||
- puppet-openstack-syntax-6-ubuntu-bionic
|
- puppet-openstack-syntax-6-ubuntu-focal
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- puppet-openstack-lint-ubuntu-bionic
|
- puppet-openstack-lint-ubuntu-focal
|
||||||
- puppet-openstack-syntax-6-ubuntu-bionic
|
- puppet-openstack-syntax-6-ubuntu-focal
|
||||||
|
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
@ -24,20 +24,20 @@
|
|||||||
name: puppet-openstack-library-jobs
|
name: puppet-openstack-library-jobs
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- puppet-openstack-libraries-puppet-lint-ubuntu-bionic
|
- puppet-openstack-libraries-puppet-lint-ubuntu-focal
|
||||||
- puppet-openstack-libraries-puppet-syntax-6-centos-8-stream
|
- puppet-openstack-libraries-puppet-syntax-6-centos-8-stream
|
||||||
- puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
|
- puppet-openstack-libraries-puppet-syntax-6-ubuntu-focal
|
||||||
- puppet-openstack-libraries-puppet-unit-6.21-centos-8-stream
|
- puppet-openstack-libraries-puppet-unit-6.21-centos-8-stream
|
||||||
- puppet-openstack-libraries-puppet-unit-6.21-ubuntu-bionic
|
- puppet-openstack-libraries-puppet-unit-6.21-ubuntu-focal
|
||||||
- puppet-openstack-libraries-puppet-unit-latest-ubuntu-bionic
|
- puppet-openstack-libraries-puppet-unit-latest-ubuntu-focal
|
||||||
- puppet-openstack-libraries-litmus-centos-8-stream
|
- puppet-openstack-libraries-litmus-centos-8-stream
|
||||||
- puppet-openstack-libraries-litmus-ubuntu-bionic
|
- puppet-openstack-libraries-litmus-ubuntu-focal
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- puppet-openstack-libraries-puppet-lint-ubuntu-bionic
|
- puppet-openstack-libraries-puppet-lint-ubuntu-focal
|
||||||
- puppet-openstack-libraries-puppet-syntax-6-centos-8-stream
|
- puppet-openstack-libraries-puppet-syntax-6-centos-8-stream
|
||||||
- puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
|
- puppet-openstack-libraries-puppet-syntax-6-ubuntu-focal
|
||||||
- puppet-openstack-libraries-puppet-unit-6.21-ubuntu-bionic
|
- puppet-openstack-libraries-puppet-unit-6.21-ubuntu-focal
|
||||||
- puppet-openstack-libraries-litmus-centos-8-stream
|
- puppet-openstack-libraries-litmus-centos-8-stream
|
||||||
|
|
||||||
# integration jobs
|
# integration jobs
|
||||||
@ -45,10 +45,10 @@
|
|||||||
name: puppet-openstack-integration-jobs-all
|
name: puppet-openstack-integration-jobs-all
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic
|
- puppet-openstack-integration-6-scenario001-tempest-ubuntu-focal
|
||||||
- puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
|
- puppet-openstack-integration-6-scenario002-tempest-ubuntu-focal
|
||||||
- puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic
|
- puppet-openstack-integration-6-scenario003-tempest-ubuntu-focal
|
||||||
- puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic
|
- puppet-openstack-integration-6-scenario004-tempest-ubuntu-focal
|
||||||
- puppet-openstack-integration-6-scenario001-tempest-centos-8-stream
|
- puppet-openstack-integration-6-scenario001-tempest-centos-8-stream
|
||||||
- puppet-openstack-integration-6-scenario002-tempest-centos-8-stream
|
- puppet-openstack-integration-6-scenario002-tempest-centos-8-stream
|
||||||
- puppet-openstack-integration-6-scenario003-tempest-centos-8-stream
|
- puppet-openstack-integration-6-scenario003-tempest-centos-8-stream
|
||||||
@ -70,11 +70,10 @@
|
|||||||
name: puppet-openstack-integration-jobs-scenario001
|
name: puppet-openstack-integration-jobs-scenario001
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic
|
- puppet-openstack-integration-6-scenario001-tempest-ubuntu-focal
|
||||||
- puppet-openstack-integration-6-scenario001-tempest-centos-8-stream
|
- puppet-openstack-integration-6-scenario001-tempest-centos-8-stream
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic
|
|
||||||
- puppet-openstack-integration-6-scenario001-tempest-centos-8-stream
|
- puppet-openstack-integration-6-scenario001-tempest-centos-8-stream
|
||||||
experimental:
|
experimental:
|
||||||
jobs:
|
jobs:
|
||||||
@ -84,11 +83,10 @@
|
|||||||
name: puppet-openstack-integration-jobs-scenario002
|
name: puppet-openstack-integration-jobs-scenario002
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
|
- puppet-openstack-integration-6-scenario002-tempest-ubuntu-focal
|
||||||
- puppet-openstack-integration-6-scenario002-tempest-centos-8-stream
|
- puppet-openstack-integration-6-scenario002-tempest-centos-8-stream
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
|
|
||||||
- puppet-openstack-integration-6-scenario002-tempest-centos-8-stream
|
- puppet-openstack-integration-6-scenario002-tempest-centos-8-stream
|
||||||
experimental:
|
experimental:
|
||||||
jobs:
|
jobs:
|
||||||
@ -98,7 +96,7 @@
|
|||||||
name: puppet-openstack-integration-jobs-scenario003
|
name: puppet-openstack-integration-jobs-scenario003
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic
|
- puppet-openstack-integration-6-scenario003-tempest-ubuntu-focal
|
||||||
- puppet-openstack-integration-6-scenario003-tempest-centos-8-stream
|
- puppet-openstack-integration-6-scenario003-tempest-centos-8-stream
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
@ -111,7 +109,7 @@
|
|||||||
name: puppet-openstack-integration-jobs-scenario004
|
name: puppet-openstack-integration-jobs-scenario004
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic
|
- puppet-openstack-integration-6-scenario004-tempest-ubuntu-focal
|
||||||
- puppet-openstack-integration-6-scenario004-tempest-centos-8-stream
|
- puppet-openstack-integration-6-scenario004-tempest-centos-8-stream
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
|
@ -9,19 +9,18 @@
|
|||||||
puppet_gem_version: 6.21.1
|
puppet_gem_version: 6.21.1
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: puppet-openstack-libraries-puppet-unit-6.21-ubuntu-bionic
|
name: puppet-openstack-libraries-puppet-unit-6.21-ubuntu-focal
|
||||||
parent: puppet-openstack-libraries-puppet-unit-base
|
parent: puppet-openstack-libraries-puppet-unit-base
|
||||||
nodeset: ubuntu-bionic
|
nodeset: ubuntu-focal
|
||||||
vars:
|
vars:
|
||||||
puppet_gem_version: 6.21.1
|
puppet_gem_version: 6.21.1
|
||||||
|
rspec_puppet_version: '= 2.8.0'
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: puppet-openstack-libraries-puppet-unit-latest-ubuntu-bionic
|
name: puppet-openstack-libraries-puppet-unit-latest-ubuntu-focal
|
||||||
parent: puppet-openstack-libraries-puppet-unit-base
|
parent: puppet-openstack-libraries-puppet-unit-base
|
||||||
nodeset: ubuntu-bionic
|
nodeset: ubuntu-focal
|
||||||
voting: false
|
voting: false
|
||||||
vars:
|
vars:
|
||||||
puppet_gem_version: latest
|
puppet_gem_version: latest
|
||||||
# TODO(tobias-urdin): Remove this when we 2.7.1 works without
|
rspec_puppet_version: '= 2.8.0'
|
||||||
# any issues and we can leave it not pinned to anything.
|
|
||||||
rspec_puppet_version: '= 2.7.1'
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
---
|
---
|
||||||
- job:
|
- job:
|
||||||
name: puppet-openstack-lint-ubuntu-bionic
|
name: puppet-openstack-lint-ubuntu-focal
|
||||||
parent: puppet-openstack-module-base
|
parent: puppet-openstack-module-base
|
||||||
run: playbooks/run-lint-tests.yaml
|
run: playbooks/run-lint-tests.yaml
|
||||||
irrelevant-files:
|
irrelevant-files:
|
||||||
@ -19,13 +19,13 @@
|
|||||||
- ^tox.ini$
|
- ^tox.ini$
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: puppet-openstack-syntax-6-ubuntu-bionic
|
name: puppet-openstack-syntax-6-ubuntu-focal
|
||||||
parent: puppet-openstack-syntax-base
|
parent: puppet-openstack-syntax-base
|
||||||
vars:
|
vars:
|
||||||
puppet: 6
|
puppet: 6
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: puppet-openstack-libraries-puppet-lint-ubuntu-bionic
|
name: puppet-openstack-libraries-puppet-lint-ubuntu-focal
|
||||||
parent: puppet-openstack-integration-base
|
parent: puppet-openstack-integration-base
|
||||||
run: playbooks/run-libraries-lint-tests.yaml
|
run: playbooks/run-libraries-lint-tests.yaml
|
||||||
pre-run: playbooks/prepare-node-unit.yaml
|
pre-run: playbooks/prepare-node-unit.yaml
|
||||||
@ -53,7 +53,7 @@
|
|||||||
- ^tox.ini$
|
- ^tox.ini$
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
|
name: puppet-openstack-libraries-puppet-syntax-6-ubuntu-focal
|
||||||
parent: puppet-openstack-libraries-puppet-syntax
|
parent: puppet-openstack-libraries-puppet-syntax
|
||||||
vars:
|
vars:
|
||||||
puppet: 6
|
puppet: 6
|
||||||
|
@ -46,9 +46,9 @@
|
|||||||
ceph: nautilus
|
ceph: nautilus
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: puppet-openstack-litmus-ubuntu-bionic
|
name: puppet-openstack-litmus-ubuntu-focal
|
||||||
parent: puppet-openstack-litmus-module-base
|
parent: puppet-openstack-litmus-module-base
|
||||||
nodeset: ubuntu-bionic
|
nodeset: ubuntu-focal
|
||||||
voting: false
|
voting: false
|
||||||
vars:
|
vars:
|
||||||
puppet_gem_version: latest
|
puppet_gem_version: latest
|
||||||
@ -62,10 +62,10 @@
|
|||||||
puppet_gem_version: 6.21.1
|
puppet_gem_version: 6.21.1
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: puppet-openstack-libraries-litmus-ubuntu-bionic
|
name: puppet-openstack-libraries-litmus-ubuntu-focal
|
||||||
parent: puppet-openstack-litmus-libraries-base
|
parent: puppet-openstack-litmus-libraries-base
|
||||||
voting: false
|
voting: false
|
||||||
nodeset: ubuntu-bionic
|
nodeset: ubuntu-focal
|
||||||
vars:
|
vars:
|
||||||
puppet_gem_version: latest
|
puppet_gem_version: latest
|
||||||
|
|
||||||
@ -74,8 +74,8 @@
|
|||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- puppet-openstack-litmus-centos-8-stream
|
- puppet-openstack-litmus-centos-8-stream
|
||||||
- puppet-openstack-litmus-ubuntu-bionic
|
- puppet-openstack-litmus-ubuntu-focal
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- puppet-openstack-litmus-centos-8-stream
|
- puppet-openstack-litmus-centos-8-stream
|
||||||
- puppet-openstack-litmus-ubuntu-bionic
|
- puppet-openstack-litmus-ubuntu-focal
|
||||||
|
@ -9,31 +9,30 @@
|
|||||||
puppet_gem_version: 6.21.1
|
puppet_gem_version: 6.21.1
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: puppet-openstack-unit-6.21-ubuntu-bionic
|
name: puppet-openstack-unit-6.21-ubuntu-focal
|
||||||
parent: puppet-openstack-unit-base
|
parent: puppet-openstack-unit-base
|
||||||
nodeset: ubuntu-bionic
|
nodeset: ubuntu-focal
|
||||||
vars:
|
vars:
|
||||||
puppet_gem_version: 6.21.1
|
puppet_gem_version: 6.21.1
|
||||||
|
rspec_puppet_version: '= 2.8.0'
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: puppet-openstack-unit-latest-ubuntu-bionic
|
name: puppet-openstack-unit-latest-ubuntu-focal
|
||||||
parent: puppet-openstack-unit-base
|
parent: puppet-openstack-unit-base
|
||||||
nodeset: ubuntu-bionic
|
nodeset: ubuntu-focal
|
||||||
voting: false
|
voting: false
|
||||||
vars:
|
vars:
|
||||||
puppet_gem_version: latest
|
puppet_gem_version: latest
|
||||||
# TODO(tobias-urdin): Remove this when we 2.7.1 works without
|
rspec_puppet_version: '= 2.8.0'
|
||||||
# any issues and we can leave it not pinned to anything.
|
|
||||||
rspec_puppet_version: '= 2.7.1'
|
|
||||||
|
|
||||||
- project-template:
|
- project-template:
|
||||||
name: puppet-openstack-module-unit-jobs
|
name: puppet-openstack-module-unit-jobs
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- puppet-openstack-unit-6.21-centos-8-stream
|
- puppet-openstack-unit-6.21-centos-8-stream
|
||||||
- puppet-openstack-unit-6.21-ubuntu-bionic
|
- puppet-openstack-unit-6.21-ubuntu-focal
|
||||||
- puppet-openstack-unit-latest-ubuntu-bionic
|
- puppet-openstack-unit-latest-ubuntu-focal
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- puppet-openstack-unit-6.21-centos-8-stream
|
- puppet-openstack-unit-6.21-centos-8-stream
|
||||||
- puppet-openstack-unit-6.21-ubuntu-bionic
|
- puppet-openstack-unit-6.21-ubuntu-focal
|
||||||
|
Loading…
Reference in New Issue
Block a user