Remove 42.3 support
No need to keep this. Let's focus on 15. This makes 15.0 testing non-voting as it is currently broken and will be fixed in a later commit (both 42.3 and 15 are broken now). Change-Id: I5f27ae963163a4f39e8ce9a088e674a89e530cfe
This commit is contained in:
parent
ea3ecc817f
commit
f1b877ec47
4
Vagrantfile
vendored
4
Vagrantfile
vendored
@ -41,10 +41,6 @@ Vagrant.configure(2) do |config|
|
|||||||
bionic.vm.box = "ubuntu/bionic64"
|
bionic.vm.box = "ubuntu/bionic64"
|
||||||
end
|
end
|
||||||
|
|
||||||
config.vm.define "opensuse423" do |leap423|
|
|
||||||
leap423.vm.box = "opensuse/openSUSE-42.3-x86_64"
|
|
||||||
end
|
|
||||||
|
|
||||||
config.vm.define "opensuse150" do |leap150|
|
config.vm.define "opensuse150" do |leap150|
|
||||||
leap150.vm.box = "opensuse/openSUSE-15.0-x86_64"
|
leap150.vm.box = "opensuse/openSUSE-15.0-x86_64"
|
||||||
end
|
end
|
||||||
|
@ -29,9 +29,6 @@ galaxy_info:
|
|||||||
- 7
|
- 7
|
||||||
- name: opensuse
|
- name: opensuse
|
||||||
versions:
|
versions:
|
||||||
- 42.1
|
|
||||||
- 42.2
|
|
||||||
- 42.3
|
|
||||||
- 15.0
|
- 15.0
|
||||||
categories:
|
categories:
|
||||||
- cloud
|
- cloud
|
||||||
|
@ -74,15 +74,3 @@
|
|||||||
register: _lxc_opensuse_image_build_info
|
register: _lxc_opensuse_image_build_info
|
||||||
- set_fact:
|
- set_fact:
|
||||||
opensuse_image_build_info: "{{ _lxc_opensuse_image_build_info.stdout }}"
|
opensuse_image_build_info: "{{ _lxc_opensuse_image_build_info.stdout }}"
|
||||||
when: ansible_distribution_version is version ('42', '<')
|
|
||||||
|
|
||||||
- name: Determine latest openSUSE container build information (Leap 42)
|
|
||||||
# Leap 42
|
|
||||||
block:
|
|
||||||
- uri:
|
|
||||||
url: "{{ _lxc_hosts_container_image_url_base }}/Dockerfile"
|
|
||||||
return_content: true
|
|
||||||
register: _lxc_opensuse_image_build_info
|
|
||||||
- set_fact:
|
|
||||||
opensuse_image_build_info: "{{ _lxc_opensuse_image_build_info.content|regex_search('Version: (.*)', '\\1')|join(' ') }}"
|
|
||||||
when: ansible_distribution_version is version ('42', '>=')
|
|
||||||
|
@ -1,50 +0,0 @@
|
|||||||
---
|
|
||||||
# Copyright 2016, Rackspace US, Inc.
|
|
||||||
# Copyright 2017, SUSE LINUX GmbH.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
lxc_hosts_external_repo:
|
|
||||||
- name: "OBS:Virtualization:containers"
|
|
||||||
uri: "{{ lxc_hosts_opensuse_mirror_obs_url }}/repositories/Virtualization:/containers/openSUSE_Leap_{{ ansible_distribution_version }}/"
|
|
||||||
state: present
|
|
||||||
|
|
||||||
system_config_dir: "/etc/sysconfig"
|
|
||||||
systemd_utils_prefix: "/usr/lib/systemd"
|
|
||||||
|
|
||||||
# Required rpm packages.
|
|
||||||
_lxc_hosts_distro_packages:
|
|
||||||
- apparmor-parser
|
|
||||||
- apparmor-profiles
|
|
||||||
- apparmor-utils
|
|
||||||
- aria2
|
|
||||||
- bridge-utils
|
|
||||||
- btrfsprogs
|
|
||||||
- dbus-1
|
|
||||||
- dnsmasq
|
|
||||||
- git-core
|
|
||||||
- libseccomp2
|
|
||||||
- lxc
|
|
||||||
- liblxc-devel
|
|
||||||
- python-lxc-python2
|
|
||||||
- xz
|
|
||||||
|
|
||||||
lxc_xz_bin: xz
|
|
||||||
|
|
||||||
lxc_cached_network_interfaces:
|
|
||||||
- src: "lxc-net-suse-bridge.cfg.j2"
|
|
||||||
dest: "/etc/sysconfig/network/ifcfg-{{ lxc_net_bridge }}"
|
|
||||||
- src: "lxc-net-suseredhat-postdown.cfg.j2"
|
|
||||||
dest: "/etc/sysconfig/network/scripts/ifdown-post-{{ lxc_net_bridge }}"
|
|
||||||
mode: "0755"
|
|
||||||
interface: "${1}"
|
|
@ -1,56 +0,0 @@
|
|||||||
---
|
|
||||||
# Copyright 2016, Rackspace US, Inc.
|
|
||||||
# Copyright 2017, SUSE LINUX GmbH.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
_lxc_hosts_container_image_url_base: "https://github.com/openSUSE/docker-containers-build/raw/openSUSE-Leap-{{ ansible_distribution_version }}/{{ ansible_architecture }}"
|
|
||||||
_lxc_hosts_container_image_url: "{{ _lxc_hosts_container_image_url_base }}/openSUSE-Leap-{{ ansible_distribution_version}}-{{ ansible_architecture }}-{{ opensuse_image_build_info }}.tar.xz"
|
|
||||||
|
|
||||||
_lxc_cache_map:
|
|
||||||
distro: opensuse
|
|
||||||
arch: "{{ lxc_architecture_mapping.get( ansible_architecture ) }}"
|
|
||||||
release: "{{ ansible_distribution_version }}"
|
|
||||||
copy_from_host:
|
|
||||||
- /etc/default/locale
|
|
||||||
- /etc/environment
|
|
||||||
- /etc/localtime
|
|
||||||
- /etc/locale.conf
|
|
||||||
- /etc/protocols
|
|
||||||
- /etc/zypp/repos.d/repo-oss.repo
|
|
||||||
- /etc/zypp/repos.d/repo-update.repo
|
|
||||||
|
|
||||||
_lxc_cache_prep_template: "prep-scripts/opensuse_leap_prep.sh.j2"
|
|
||||||
|
|
||||||
_lxc_cache_distro_packages:
|
|
||||||
- ca-certificates-mozilla
|
|
||||||
- cronie
|
|
||||||
- dbus-1
|
|
||||||
- gcc
|
|
||||||
- iproute2
|
|
||||||
- iputils
|
|
||||||
- libffi-devel
|
|
||||||
- libopenssl-devel
|
|
||||||
- netcfg
|
|
||||||
- openssh
|
|
||||||
- openssl
|
|
||||||
- python
|
|
||||||
- python-devel
|
|
||||||
- python-xml
|
|
||||||
- rsync
|
|
||||||
- sudo
|
|
||||||
- systemd
|
|
||||||
- systemd-sysvinit
|
|
||||||
- tar
|
|
||||||
- wget
|
|
||||||
- which
|
|
@ -14,13 +14,7 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
lxc_hosts_external_repo:
|
lxc_hosts_external_repo: []
|
||||||
- name: "OBS:Virtualization:containers"
|
|
||||||
uri: "{{ lxc_hosts_opensuse_mirror_obs_url }}/repositories/Virtualization:/containers/openSUSE_Leap_{{ ansible_distribution_version }}/"
|
|
||||||
# NOTE(hwoarang) Leap 15.X is newer than 42.X and it has all the necessary LXC packages so we don't need
|
|
||||||
# to use the OBS repository. As such we only add it if version is >= 42 so we can capture all the old Leap
|
|
||||||
# releases. Using the external repo can be removed once we drop support for 42.X
|
|
||||||
state: "{{ (ansible_distribution_version is version ('42.1', '>=')) | ternary ('present', 'absent') }}"
|
|
||||||
|
|
||||||
system_config_dir: "/etc/sysconfig"
|
system_config_dir: "/etc/sysconfig"
|
||||||
systemd_utils_prefix: "/usr/lib/systemd"
|
systemd_utils_prefix: "/usr/lib/systemd"
|
||||||
|
@ -33,13 +33,6 @@
|
|||||||
vars:
|
vars:
|
||||||
tox_env: dir
|
tox_env: dir
|
||||||
|
|
||||||
- job:
|
|
||||||
name: openstack-ansible-lxc-dir-opensuse-423
|
|
||||||
parent: openstack-ansible-lxc-container-create
|
|
||||||
nodeset: opensuse-423
|
|
||||||
vars:
|
|
||||||
tox_env: dir
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: openstack-ansible-lxc-dir-opensuse-150
|
name: openstack-ansible-lxc-dir-opensuse-150
|
||||||
parent: openstack-ansible-lxc-container-create
|
parent: openstack-ansible-lxc-container-create
|
||||||
@ -57,13 +50,6 @@
|
|||||||
vars:
|
vars:
|
||||||
tox_env: btrfs
|
tox_env: btrfs
|
||||||
|
|
||||||
- job:
|
|
||||||
name: openstack-ansible-lxc-btrfs-opensuse-423
|
|
||||||
parent: openstack-ansible-lxc-container-create
|
|
||||||
nodeset: opensuse-423
|
|
||||||
vars:
|
|
||||||
tox_env: btrfs
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: openstack-ansible-lxc-btrfs-opensuse-150
|
name: openstack-ansible-lxc-btrfs-opensuse-150
|
||||||
parent: openstack-ansible-lxc-container-create
|
parent: openstack-ansible-lxc-container-create
|
||||||
@ -79,13 +65,6 @@
|
|||||||
vars:
|
vars:
|
||||||
tox_env: mnctl
|
tox_env: mnctl
|
||||||
|
|
||||||
- job:
|
|
||||||
name: openstack-ansible-lxc-machinectl-opensuse-423
|
|
||||||
parent: openstack-ansible-lxc-container-create
|
|
||||||
nodeset: opensuse-423
|
|
||||||
vars:
|
|
||||||
tox_env: mnctl
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: openstack-ansible-lxc-machinectl-opensuse-150
|
name: openstack-ansible-lxc-machinectl-opensuse-150
|
||||||
parent: openstack-ansible-lxc-container-create
|
parent: openstack-ansible-lxc-container-create
|
||||||
@ -107,13 +86,6 @@
|
|||||||
vars:
|
vars:
|
||||||
tox_env: ofs
|
tox_env: ofs
|
||||||
|
|
||||||
- job:
|
|
||||||
name: openstack-ansible-lxc-overlayfs-opensuse-423
|
|
||||||
parent: openstack-ansible-lxc-container-create
|
|
||||||
nodeset: opensuse-423
|
|
||||||
vars:
|
|
||||||
tox_env: ofs
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: openstack-ansible-lxc-overlayfs-opensuse-150
|
name: openstack-ansible-lxc-overlayfs-opensuse-150
|
||||||
parent: openstack-ansible-lxc-container-create
|
parent: openstack-ansible-lxc-container-create
|
||||||
|
@ -21,17 +21,17 @@
|
|||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- openstack-ansible-lxc-dir-centos-7
|
- openstack-ansible-lxc-dir-centos-7
|
||||||
- openstack-ansible-lxc-dir-opensuse-423
|
- openstack-ansible-lxc-dir-opensuse-150:
|
||||||
- openstack-ansible-lxc-dir-opensuse-150
|
voting: false
|
||||||
- openstack-ansible-lxc-dir-ubuntu-bionic
|
- openstack-ansible-lxc-dir-ubuntu-bionic
|
||||||
- openstack-ansible-lxc-btrfs-ubuntu-bionic
|
- openstack-ansible-lxc-btrfs-ubuntu-bionic
|
||||||
- openstack-ansible-lxc-btrfs-opensuse-423
|
- openstack-ansible-lxc-btrfs-opensuse-150:
|
||||||
- openstack-ansible-lxc-btrfs-opensuse-150
|
voting: false
|
||||||
- openstack-ansible-lxc-machinectl-ubuntu-bionic
|
- openstack-ansible-lxc-machinectl-ubuntu-bionic
|
||||||
- openstack-ansible-lxc-machinectl-centos-7
|
- openstack-ansible-lxc-machinectl-centos-7
|
||||||
- openstack-ansible-lxc-machinectl-opensuse-423
|
- openstack-ansible-lxc-machinectl-opensuse-150:
|
||||||
- openstack-ansible-lxc-machinectl-opensuse-150
|
voting: false
|
||||||
- openstack-ansible-lxc-overlayfs-ubuntu-bionic
|
- openstack-ansible-lxc-overlayfs-ubuntu-bionic
|
||||||
- openstack-ansible-lxc-overlayfs-opensuse-423
|
- openstack-ansible-lxc-overlayfs-opensuse-150:
|
||||||
- openstack-ansible-lxc-overlayfs-opensuse-150
|
voting: false
|
||||||
- openstack-ansible-lxc-zfs-ubuntu-bionic
|
- openstack-ansible-lxc-zfs-ubuntu-bionic
|
||||||
|
Loading…
Reference in New Issue
Block a user