Merge "Ubuntu: Switch to Focal and Victoria"
This commit is contained in:
Zuul
Gerrit Code Review
commit
b6bdb400a0
@ -194,10 +194,7 @@ install_puppet() {
|
||||
print_header 'Setup (Debian based)'
|
||||
if [ "${MANAGE_REPOS}" == "true" ] ; then
|
||||
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
|
||||
fi
|
||||
$SUDO mkdir -p /etc/apt/sources.list.d
|
||||
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-ceph
|
||||
|
||||
@ -12,7 +12,7 @@ class openstack_integration::repos {
|
||||
'ubuntu': {
|
||||
include apt
|
||||
class { 'openstack_extras::repo::debian::ubuntu':
|
||||
release => 'ussuri',
|
||||
release => 'victoria',
|
||||
package_require => true,
|
||||
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
|
||||
# https://github.com/openstack/neutron/blob/master/test-requirements.txt#L20
|
||||
if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) {
|
||||
package { ['python-ddt', 'python-oslotest', 'python-gabbi']:
|
||||
package { ['python3-ddt', 'python3-oslotest', 'python3-gabbi']:
|
||||
ensure => present
|
||||
}
|
||||
}
|
||||
|
||||
@ -83,7 +83,7 @@
|
||||
name: puppet-openstack-base
|
||||
pre-run: playbooks/prepare-node-common.yaml
|
||||
abstract: true
|
||||
nodeset: ubuntu-bionic
|
||||
nodeset: ubuntu-focal
|
||||
vars:
|
||||
puppet: 6
|
||||
use_puppetlabs: false
|
||||
|
||||
@ -15,9 +15,9 @@
|
||||
ceph: nautilus
|
||||
|
||||
- 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
|
||||
nodeset: ubuntu-bionic
|
||||
nodeset: ubuntu-focal
|
||||
voting: false
|
||||
|
||||
- job:
|
||||
@ -40,9 +40,9 @@
|
||||
scenario: scenario002
|
||||
|
||||
- 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
|
||||
nodeset: ubuntu-bionic
|
||||
nodeset: ubuntu-focal
|
||||
voting: false
|
||||
|
||||
- job:
|
||||
@ -65,9 +65,9 @@
|
||||
scenario: scenario003
|
||||
|
||||
- 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
|
||||
nodeset: ubuntu-bionic
|
||||
nodeset: ubuntu-focal
|
||||
voting: false
|
||||
|
||||
- job:
|
||||
@ -91,9 +91,9 @@
|
||||
ceph: nautilus
|
||||
|
||||
- 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
|
||||
nodeset: ubuntu-bionic
|
||||
nodeset: ubuntu-focal
|
||||
voting: false
|
||||
|
||||
- job:
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
name: puppet-openstack-check-jobs
|
||||
check:
|
||||
jobs:
|
||||
- puppet-openstack-lint-ubuntu-bionic
|
||||
- puppet-openstack-syntax-6-ubuntu-bionic
|
||||
- puppet-openstack-lint-ubuntu-focal
|
||||
- puppet-openstack-syntax-6-ubuntu-focal
|
||||
gate:
|
||||
jobs:
|
||||
- puppet-openstack-lint-ubuntu-bionic
|
||||
- puppet-openstack-syntax-6-ubuntu-bionic
|
||||
- puppet-openstack-lint-ubuntu-focal
|
||||
- puppet-openstack-syntax-6-ubuntu-focal
|
||||
|
||||
- project:
|
||||
templates:
|
||||
@ -24,20 +24,20 @@
|
||||
name: puppet-openstack-library-jobs
|
||||
check:
|
||||
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-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-ubuntu-bionic
|
||||
- puppet-openstack-libraries-puppet-unit-latest-ubuntu-bionic
|
||||
- puppet-openstack-libraries-puppet-unit-6.21-ubuntu-focal
|
||||
- puppet-openstack-libraries-puppet-unit-latest-ubuntu-focal
|
||||
- puppet-openstack-libraries-litmus-centos-8-stream
|
||||
- puppet-openstack-libraries-litmus-ubuntu-bionic
|
||||
- puppet-openstack-libraries-litmus-ubuntu-focal
|
||||
gate:
|
||||
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-ubuntu-bionic
|
||||
- puppet-openstack-libraries-puppet-unit-6.21-ubuntu-bionic
|
||||
- puppet-openstack-libraries-puppet-syntax-6-ubuntu-focal
|
||||
- puppet-openstack-libraries-puppet-unit-6.21-ubuntu-focal
|
||||
- puppet-openstack-libraries-litmus-centos-8-stream
|
||||
|
||||
# integration jobs
|
||||
@ -45,10 +45,10 @@
|
||||
name: puppet-openstack-integration-jobs-all
|
||||
check:
|
||||
jobs:
|
||||
- puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic
|
||||
- puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
|
||||
- puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic
|
||||
- puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic
|
||||
- puppet-openstack-integration-6-scenario001-tempest-ubuntu-focal
|
||||
- puppet-openstack-integration-6-scenario002-tempest-ubuntu-focal
|
||||
- puppet-openstack-integration-6-scenario003-tempest-ubuntu-focal
|
||||
- puppet-openstack-integration-6-scenario004-tempest-ubuntu-focal
|
||||
- puppet-openstack-integration-6-scenario001-tempest-centos-8-stream
|
||||
- puppet-openstack-integration-6-scenario002-tempest-centos-8-stream
|
||||
- puppet-openstack-integration-6-scenario003-tempest-centos-8-stream
|
||||
@ -70,11 +70,10 @@
|
||||
name: puppet-openstack-integration-jobs-scenario001
|
||||
check:
|
||||
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
|
||||
gate:
|
||||
jobs:
|
||||
- puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic
|
||||
- puppet-openstack-integration-6-scenario001-tempest-centos-8-stream
|
||||
experimental:
|
||||
jobs:
|
||||
@ -84,11 +83,10 @@
|
||||
name: puppet-openstack-integration-jobs-scenario002
|
||||
check:
|
||||
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
|
||||
gate:
|
||||
jobs:
|
||||
- puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
|
||||
- puppet-openstack-integration-6-scenario002-tempest-centos-8-stream
|
||||
experimental:
|
||||
jobs:
|
||||
@ -98,7 +96,7 @@
|
||||
name: puppet-openstack-integration-jobs-scenario003
|
||||
check:
|
||||
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
|
||||
gate:
|
||||
jobs:
|
||||
@ -111,7 +109,7 @@
|
||||
name: puppet-openstack-integration-jobs-scenario004
|
||||
check:
|
||||
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
|
||||
gate:
|
||||
jobs:
|
||||
|
||||
@ -9,19 +9,18 @@
|
||||
puppet_gem_version: 6.21.1
|
||||
|
||||
- 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
|
||||
nodeset: ubuntu-bionic
|
||||
nodeset: ubuntu-focal
|
||||
vars:
|
||||
puppet_gem_version: 6.21.1
|
||||
rspec_puppet_version: '= 2.8.0'
|
||||
|
||||
- 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
|
||||
nodeset: ubuntu-bionic
|
||||
nodeset: ubuntu-focal
|
||||
voting: false
|
||||
vars:
|
||||
puppet_gem_version: latest
|
||||
# TODO(tobias-urdin): Remove this when we 2.7.1 works without
|
||||
# any issues and we can leave it not pinned to anything.
|
||||
rspec_puppet_version: '= 2.7.1'
|
||||
rspec_puppet_version: '= 2.8.0'
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
---
|
||||
- job:
|
||||
name: puppet-openstack-lint-ubuntu-bionic
|
||||
name: puppet-openstack-lint-ubuntu-focal
|
||||
parent: puppet-openstack-module-base
|
||||
run: playbooks/run-lint-tests.yaml
|
||||
irrelevant-files:
|
||||
@ -19,13 +19,13 @@
|
||||
- ^tox.ini$
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-syntax-6-ubuntu-bionic
|
||||
name: puppet-openstack-syntax-6-ubuntu-focal
|
||||
parent: puppet-openstack-syntax-base
|
||||
vars:
|
||||
puppet: 6
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-libraries-puppet-lint-ubuntu-bionic
|
||||
name: puppet-openstack-libraries-puppet-lint-ubuntu-focal
|
||||
parent: puppet-openstack-integration-base
|
||||
run: playbooks/run-libraries-lint-tests.yaml
|
||||
pre-run: playbooks/prepare-node-unit.yaml
|
||||
@ -53,7 +53,7 @@
|
||||
- ^tox.ini$
|
||||
|
||||
- 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
|
||||
vars:
|
||||
puppet: 6
|
||||
|
||||
@ -46,9 +46,9 @@
|
||||
ceph: nautilus
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-litmus-ubuntu-bionic
|
||||
name: puppet-openstack-litmus-ubuntu-focal
|
||||
parent: puppet-openstack-litmus-module-base
|
||||
nodeset: ubuntu-bionic
|
||||
nodeset: ubuntu-focal
|
||||
voting: false
|
||||
vars:
|
||||
puppet_gem_version: latest
|
||||
@ -62,10 +62,10 @@
|
||||
puppet_gem_version: 6.21.1
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-libraries-litmus-ubuntu-bionic
|
||||
name: puppet-openstack-libraries-litmus-ubuntu-focal
|
||||
parent: puppet-openstack-litmus-libraries-base
|
||||
voting: false
|
||||
nodeset: ubuntu-bionic
|
||||
nodeset: ubuntu-focal
|
||||
vars:
|
||||
puppet_gem_version: latest
|
||||
|
||||
@ -74,8 +74,8 @@
|
||||
check:
|
||||
jobs:
|
||||
- puppet-openstack-litmus-centos-8-stream
|
||||
- puppet-openstack-litmus-ubuntu-bionic
|
||||
- puppet-openstack-litmus-ubuntu-focal
|
||||
gate:
|
||||
jobs:
|
||||
- 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
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-unit-6.21-ubuntu-bionic
|
||||
name: puppet-openstack-unit-6.21-ubuntu-focal
|
||||
parent: puppet-openstack-unit-base
|
||||
nodeset: ubuntu-bionic
|
||||
nodeset: ubuntu-focal
|
||||
vars:
|
||||
puppet_gem_version: 6.21.1
|
||||
rspec_puppet_version: '= 2.8.0'
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-unit-latest-ubuntu-bionic
|
||||
name: puppet-openstack-unit-latest-ubuntu-focal
|
||||
parent: puppet-openstack-unit-base
|
||||
nodeset: ubuntu-bionic
|
||||
nodeset: ubuntu-focal
|
||||
voting: false
|
||||
vars:
|
||||
puppet_gem_version: latest
|
||||
# TODO(tobias-urdin): Remove this when we 2.7.1 works without
|
||||
# any issues and we can leave it not pinned to anything.
|
||||
rspec_puppet_version: '= 2.7.1'
|
||||
rspec_puppet_version: '= 2.8.0'
|
||||
|
||||
- project-template:
|
||||
name: puppet-openstack-module-unit-jobs
|
||||
check:
|
||||
jobs:
|
||||
- puppet-openstack-unit-6.21-centos-8-stream
|
||||
- puppet-openstack-unit-6.21-ubuntu-bionic
|
||||
- puppet-openstack-unit-latest-ubuntu-bionic
|
||||
- puppet-openstack-unit-6.21-ubuntu-focal
|
||||
- puppet-openstack-unit-latest-ubuntu-focal
|
||||
gate:
|
||||
jobs:
|
||||
- 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