Browse Source

Merge "Fedora 30 functional and boot tests"

tags/2.27.0
Zuul 5 months ago
parent
commit
3e0d61ac9a
6 changed files with 25 additions and 4 deletions
  1. +15
    -0
      .zuul.d/jobs.yaml
  2. +1
    -0
      .zuul.d/project.yaml
  3. +1
    -1
      diskimage_builder/elements/fedora-minimal/environment.d/10-fedora-distro-name.bash
  4. +3
    -1
      diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash
  5. +3
    -0
      diskimage_builder/elements/simple-init/pkg-map
  6. +2
    -2
      doc/source/user_guide/supported_distros.rst

+ 15
- 0
.zuul.d/jobs.yaml View File

@@ -241,6 +241,21 @@
env-vars:
DIB_SIMPLE_INIT_NETWORKMANAGER: '1'

- job:
name: dib-nodepool-functional-openstack-fedora-30-src
description: |
Test building and booting a Fedora 30 image with Nodepool and OpenStack
parent: dib-nodepool-functional-src-base
vars:
nodepool_extra_packages:
- rpm
- yum-utils
nodepool_diskimage:
base_element: fedora-minimal
release: '30'
env-vars:
DIB_SIMPLE_INIT_NETWORKMANAGER: '1'

- job:
name: dib-nodepool-functional-openstack-ubuntu-trusty-src
description: |

+ 1
- 0
.zuul.d/project.yaml View File

@@ -12,6 +12,7 @@
- openstack-tox-pylint
- dib-nodepool-functional-openstack-centos-7-src
- dib-nodepool-functional-openstack-fedora-29-src
- dib-nodepool-functional-openstack-fedora-30-src
- dib-nodepool-functional-openstack-opensuse-150-src
- dib-nodepool-functional-openstack-opensuse-151-src
- dib-nodepool-functional-openstack-ubuntu-trusty-src

+ 1
- 1
diskimage_builder/elements/fedora-minimal/environment.d/10-fedora-distro-name.bash View File

@@ -1,2 +1,2 @@
export DISTRO_NAME=fedora
export DIB_RELEASE=${DIB_RELEASE:-29}
export DIB_RELEASE=${DIB_RELEASE:-30}

+ 3
- 1
diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash View File

@@ -1,5 +1,5 @@
export DISTRO_NAME=fedora
export DIB_RELEASE=${DIB_RELEASE:-29}
export DIB_RELEASE=${DIB_RELEASE:-30}

# Note the filename URL has a "sub-release" in it
# http:// ... Fedora-Cloud-Base-25-1.3.x86_64.qcow2
@@ -15,6 +15,8 @@ if [[ ${DIB_RELEASE} == '28' ]]; then
export DIB_FEDORA_SUBRELEASE=1.1
elif [[ ${DIB_RELEASE} == '29' ]]; then
export DIB_FEDORA_SUBRELEASE=1.2
elif [[ ${DIB_RELEASE} == '30' ]]; then
export DIB_FEDORA_SUBRELEASE=1.2
else
echo "Unsupported Fedora release"
exit 1

+ 3
- 0
diskimage_builder/elements/simple-init/pkg-map View File

@@ -22,6 +22,9 @@
"fedora": {
"29": {
"network-scripts": "network-scripts"
},
"30": {
"network-scripts": "network-scripts"
}
}
},

+ 2
- 2
doc/source/user_guide/supported_distros.rst View File

@@ -5,7 +5,7 @@ Distributions which are supported as a build host:

- Centos 6, 7
- Debian 8 ("jessie")
- Fedora 28, 29
- Fedora 28, 29, 30
- RHEL 6, 7
- Ubuntu 14.04 ("trusty")
- Gentoo
@@ -16,7 +16,7 @@ Distributions which are supported as a target for an image:

- Centos 6, 7
- Debian 8 ("jessie")
- Fedora 28, 29
- Fedora 28, 29, 30
- RHEL 6, 7
- Ubuntu 12.04 ("precise"), 14.04 ("trusty")
- Gentoo

Loading…
Cancel
Save