Drop openEuler support
The job is broken since it is running with python3.7 and most services now require at least python3.8. Signed-off-by: Dr. Jens Harbott <harbott@osism.tech> Change-Id: Ie21f71acffabd78c79e2b141951ccf30a5c06445
This commit is contained in:
Dr. Jens Harbott
parent
08254ca312
commit
560ee16a85
25
.zuul.yaml
25
.zuul.yaml
@ -106,16 +106,6 @@
|
||||
nodes:
|
||||
- controller
|
||||
|
||||
- nodeset:
|
||||
name: devstack-single-node-openeuler-20.03-sp2
|
||||
nodes:
|
||||
- name: controller
|
||||
label: openEuler-20-03-LTS-SP2
|
||||
groups:
|
||||
- name: tempest
|
||||
nodes:
|
||||
- controller
|
||||
|
||||
- nodeset:
|
||||
name: openstack-two-node
|
||||
nodes:
|
||||
@ -712,20 +702,6 @@
|
||||
# Enable Neutron ML2/OVS services
|
||||
q-agt: true
|
||||
|
||||
- job:
|
||||
name: devstack-platform-openEuler-20.03-SP2
|
||||
parent: tempest-full-py3
|
||||
description: openEuler 20.03 SP2 platform test
|
||||
nodeset: devstack-single-node-openeuler-20.03-sp2
|
||||
voting: false
|
||||
timeout: 9000
|
||||
vars:
|
||||
configure_swap_size: 4096
|
||||
devstack_localrc:
|
||||
# NOTE(wxy): OVN package is not supported by openEuler yet. Build it
|
||||
# from source instead.
|
||||
OVN_BUILD_FROM_SOURCE: True
|
||||
|
||||
- job:
|
||||
name: devstack-platform-ubuntu-jammy
|
||||
parent: tempest-full-py3
|
||||
@ -1001,7 +977,6 @@
|
||||
|
||||
experimental:
|
||||
jobs:
|
||||
- devstack-platform-openEuler-20.03-SP2
|
||||
- nova-multi-cell
|
||||
- nova-next
|
||||
- neutron-fullstack-with-uwsgi
|
||||
|
||||
@ -38,7 +38,7 @@ Install Linux
|
||||
|
||||
Start with a clean and minimal install of a Linux system. DevStack
|
||||
attempts to support the two latest LTS releases of Ubuntu, the
|
||||
latest/current Fedora version, CentOS/RHEL 8, OpenSUSE and openEuler.
|
||||
latest/current Fedora version, CentOS/RHEL 8 and OpenSUSE.
|
||||
|
||||
If you do not have a preference, Ubuntu 20.04 (Focal Fossa) is the
|
||||
most tested, and will probably go the smoothest.
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
ceph # NOPRIME
|
||||
redhat-lsb-core # not:rhel9,openEuler-20.03
|
||||
redhat-lsb-core # not:rhel9
|
||||
xfsprogs
|
||||
|
||||
@ -16,7 +16,6 @@ libjpeg-turbo-devel # Pillow 3.0.0
|
||||
libxml2-devel # lxml
|
||||
libxslt-devel # lxml
|
||||
libyaml-devel
|
||||
make # dist:openEuler-20.03
|
||||
mod_ssl # required for tls-proxy on centos 9 stream computes
|
||||
net-tools
|
||||
openssh-server
|
||||
@ -29,8 +28,7 @@ psmisc
|
||||
python3-devel
|
||||
python3-pip
|
||||
python3-systemd
|
||||
redhat-rpm-config # not:openEuler-20.03 missing dep for gcc hardening flags, see rhbz#1217376
|
||||
systemd-devel # dist:openEuler-20.03
|
||||
redhat-rpm-config # missing dep for gcc hardening flags, see rhbz#1217376
|
||||
tar
|
||||
tcpdump
|
||||
unzip
|
||||
|
||||
@ -6,7 +6,7 @@ ebtables
|
||||
genisoimage # not:rhel9 required for config_drive
|
||||
iptables
|
||||
iputils
|
||||
kernel-modules # not:openEuler-20.03
|
||||
kernel-modules
|
||||
kpartx
|
||||
parted
|
||||
polkit
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
curl
|
||||
liberasurecode-devel # not:openEuler-20.03
|
||||
liberasurecode-devel
|
||||
memcached
|
||||
rsync-daemon
|
||||
sqlite
|
||||
|
||||
@ -399,7 +399,7 @@ function _ensure_lsb_release {
|
||||
elif [[ -x $(command -v zypper 2>/dev/null) ]]; then
|
||||
sudo zypper -n install lsb-release
|
||||
elif [[ -x $(command -v dnf 2>/dev/null) ]]; then
|
||||
sudo dnf install -y redhat-lsb-core || sudo dnf install -y openeuler-lsb
|
||||
sudo dnf install -y redhat-lsb-core
|
||||
else
|
||||
die $LINENO "Unable to find or auto-install lsb_release"
|
||||
fi
|
||||
@ -471,10 +471,6 @@ function GetDistro {
|
||||
# Drop the . release as we assume it's compatible
|
||||
# XXX re-evaluate when we get RHEL10
|
||||
DISTRO="rhel${os_RELEASE::1}"
|
||||
elif [[ "$os_VENDOR" =~ (openEuler) ]]; then
|
||||
# The DISTRO here is `openEuler-20.03`. While, actually only openEuler
|
||||
# 20.03 LTS SP2 is fully tested. Other SP version maybe have bugs.
|
||||
DISTRO="openEuler-$os_RELEASE"
|
||||
else
|
||||
# We can't make a good choice here. Setting a sensible DISTRO
|
||||
# is part of the problem, but not the major issue -- we really
|
||||
@ -526,7 +522,6 @@ function is_fedora {
|
||||
fi
|
||||
|
||||
[ "$os_VENDOR" = "Fedora" ] || [ "$os_VENDOR" = "Red Hat" ] || \
|
||||
[ "$os_VENDOR" = "openEuler" ] || \
|
||||
[ "$os_VENDOR" = "RedHatEnterpriseServer" ] || \
|
||||
[ "$os_VENDOR" = "RedHatEnterprise" ] || \
|
||||
[ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "CentOSStream" ] || \
|
||||
@ -576,12 +571,6 @@ function is_ubuntu {
|
||||
[ "$os_PACKAGE" = "deb" ]
|
||||
}
|
||||
|
||||
function is_openeuler {
|
||||
if [[ -z "$os_PACKAGE" ]]; then
|
||||
GetOSVersion
|
||||
fi
|
||||
[ "$os_VENDOR" = "openEuler" ]
|
||||
}
|
||||
# Git Functions
|
||||
# =============
|
||||
|
||||
|
||||
@ -95,7 +95,7 @@ function install_apache_uwsgi {
|
||||
# didn't fix Python 3.10 compatibility before release. Should be
|
||||
# fixed in uwsgi 4.9.0; can remove this when packages available
|
||||
# or we drop this release
|
||||
elif is_fedora && ! is_openeuler && ! [[ $DISTRO =~ f35 ]]; then
|
||||
elif is_fedora && ! [[ $DISTRO =~ f35 ]]; then
|
||||
# Note httpd comes with mod_proxy_uwsgi and it is loaded by
|
||||
# default; the mod_proxy_uwsgi package actually conflicts now.
|
||||
# See:
|
||||
|
||||
4
lib/nova
4
lib/nova
@ -324,11 +324,7 @@ EOF
|
||||
|
||||
# set chap algorithms. The default chap_algorithm is md5 which will
|
||||
# not work under FIPS.
|
||||
# FIXME(alee) For some reason, this breaks openeuler. Openeuler devs should weigh in
|
||||
# and determine the correct solution for openeuler here
|
||||
if ! is_openeuler; then
|
||||
iniset -sudo /etc/iscsi/iscsid.conf DEFAULT "node.session.auth.chap_algs" "SHA3-256,SHA256"
|
||||
fi
|
||||
|
||||
# ensure that iscsid is started, even when disabled by default
|
||||
restart_service iscsid
|
||||
|
||||
@ -64,7 +64,6 @@
|
||||
'Debian': '/etc/apache2/sites-enabled/'
|
||||
'Suse': '/etc/apache2/conf.d/'
|
||||
'RedHat': '/etc/httpd/conf.d/'
|
||||
'openEuler': '/etc/httpd/conf.d/'
|
||||
|
||||
- name: Discover configurations
|
||||
find:
|
||||
|
||||
9
stack.sh
9
stack.sh
@ -229,7 +229,7 @@ write_devstack_version
|
||||
|
||||
# Warn users who aren't on an explicitly supported distro, but allow them to
|
||||
# override check and attempt installation with ``FORCE=yes ./stack``
|
||||
SUPPORTED_DISTROS="bullseye|focal|jammy|f35|opensuse-15.2|opensuse-tumbleweed|rhel8|rhel9|openEuler-20.03"
|
||||
SUPPORTED_DISTROS="bullseye|focal|jammy|f35|opensuse-15.2|opensuse-tumbleweed|rhel8|rhel9"
|
||||
|
||||
if [[ ! ${DISTRO} =~ $SUPPORTED_DISTROS ]]; then
|
||||
echo "WARNING: this script has not been tested on $DISTRO"
|
||||
@ -280,13 +280,6 @@ chmod 0440 $TEMPFILE
|
||||
sudo chown root:root $TEMPFILE
|
||||
sudo mv $TEMPFILE /etc/sudoers.d/50_stack_sh
|
||||
|
||||
# TODO(wxy): Currently some base packages are not installed by default in
|
||||
# openEuler. Remove the code below once the packaged are installed by default
|
||||
# in the future.
|
||||
if [[ $DISTRO == "openEuler-20.03" ]]; then
|
||||
install_package hostname
|
||||
fi
|
||||
|
||||
# Configure Distro Repositories
|
||||
# -----------------------------
|
||||
|
||||
|
||||
@ -153,32 +153,8 @@ function fixup_ubuntu {
|
||||
sudo rm -rf /usr/lib/python3/dist-packages/simplejson-*.egg-info
|
||||
}
|
||||
|
||||
function fixup_openeuler {
|
||||
if ! is_openeuler; then
|
||||
return
|
||||
fi
|
||||
|
||||
if is_arch "x86_64"; then
|
||||
arch="x86_64"
|
||||
elif is_arch "aarch64"; then
|
||||
arch="aarch64"
|
||||
fi
|
||||
|
||||
# Some packages' version in openEuler are too old, use the newer ones we
|
||||
# provide in oepkg. (oepkg is an openEuler third part yum repo which is
|
||||
# endorsed by openEuler community)
|
||||
(echo '[openstack-ci]'
|
||||
echo 'name=openstack'
|
||||
echo 'baseurl=https://repo.oepkgs.net/openEuler/rpm/openEuler-20.03-LTS-SP2/budding-openeuler/openstack-master-ci/'$arch'/'
|
||||
echo 'enabled=1'
|
||||
echo 'gpgcheck=0') | sudo tee -a /etc/yum.repos.d/openstack-master.repo > /dev/null
|
||||
|
||||
yum_install liberasurecode-devel
|
||||
}
|
||||
|
||||
function fixup_all {
|
||||
fixup_ubuntu
|
||||
fixup_fedora
|
||||
fixup_suse
|
||||
fixup_openeuler
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user