From 8b8f35e659753efd7fca8575d06d3dc1f7ffece9 Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Fri, 31 Dec 2021 13:16:32 +0800 Subject: [PATCH] 5.4.0 --- .gitlab-ci.yml | 7 --- CHANGELOG.md | 7 ++- README.md | 4 +- meta/main.yml | 1 - molecule/opensuse-leap-15.2/cleanup.yml | 1 - molecule/opensuse-leap-15.2/converge.yml | 1 - .../group_vars/all/00-defaults.yml | 1 - .../group_vars/all/99-molecule.yml | 15 ----- molecule/opensuse-leap-15.2/molecule.yml | 58 ------------------- molecule/opensuse-leap-15.2/prepare.yml | 1 - molecule/opensuse-leap-15.2/verify.yml | 1 - vars/suse-15.2.yml | 36 ------------ 12 files changed, 8 insertions(+), 125 deletions(-) delete mode 120000 molecule/opensuse-leap-15.2/cleanup.yml delete mode 120000 molecule/opensuse-leap-15.2/converge.yml delete mode 120000 molecule/opensuse-leap-15.2/group_vars/all/00-defaults.yml delete mode 100644 molecule/opensuse-leap-15.2/group_vars/all/99-molecule.yml delete mode 100644 molecule/opensuse-leap-15.2/molecule.yml delete mode 120000 molecule/opensuse-leap-15.2/prepare.yml delete mode 120000 molecule/opensuse-leap-15.2/verify.yml delete mode 100644 vars/suse-15.2.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c9ec614..d9f0d93 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -170,13 +170,6 @@ test:opensuse-leap-15.3: _MOLECULE_SCENARIO_NAME: "opensuse-leap-15.3" allow_failure: true -test:opensuse-leap-15.2: - <<: *job-molecule - stage: test - variables: - _MOLECULE_SCENARIO_NAME: "opensuse-leap-15.2" - allow_failure: true - test:debian-11: <<: *job-molecule stage: test diff --git a/CHANGELOG.md b/CHANGELOG.md index 501e6e7..d20b91d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,14 @@ # Ansible Role for Kapacitor -## 5.4.0 - TBC +## 5.5.0 - TBC ### Major Changes +## 5.4.0 - 2021-12-31 + +### Major Changes + + - Remove openSUSE Leap 15.2 support - Upgrade minimal Ansible community package support to 4.10 ## 5.3.0 - 2021-10-20 diff --git a/README.md b/README.md index 8b90669..2235243 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ AlviStack [![Gitlab pipeline status](https://img.shields.io/gitlab/pipeline/alvistack/ansible-role-kapacitor/master)](https://gitlab.com/alvistack/ansible-role-kapacitor/-/pipelines) -[![GitHub release](https://img.shields.io/github/release/alvistack/ansible-role-kapacitor.svg)](https://github.com/alvistack/ansible-role-kapacitor/releases) +[![GitHub tag](https://img.shields.io/github/tag/alvistack/ansible-role-kapacitor.svg)](https://github.com/alvistack/ansible-role-kapacitor/tags) [![GitHub license](https://img.shields.io/github/license/alvistack/ansible-role-kapacitor.svg)](https://github.com/alvistack/ansible-role-kapacitor/blob/master/LICENSE) [![Ansible Role](https://img.shields.io/badge/galaxy-alvistack.kapacitor-blue.svg)](https://galaxy.ansible.com/alvistack/kapacitor) @@ -17,7 +17,7 @@ This role was designed for: - Ubuntu 18.04, 20.04, 21.04, 21.10 - CentOS 7, 8 Stream - - openSUSE Leap 15.2, Leap 15.3, Tumbleweed + - openSUSE Leap 15.3, Tumbleweed - Debian 10, 11 - Fedora 34, 35 - RHEL 7, 8 diff --git a/meta/main.yml b/meta/main.yml index 3680b86..1bf1cde 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -36,7 +36,6 @@ galaxy_info: - name: opensuse versions: - "15.3" - - "15.2" - name: Debian versions: - bullseye diff --git a/molecule/opensuse-leap-15.2/cleanup.yml b/molecule/opensuse-leap-15.2/cleanup.yml deleted file mode 120000 index d0b7d7a..0000000 --- a/molecule/opensuse-leap-15.2/cleanup.yml +++ /dev/null @@ -1 +0,0 @@ -../default/cleanup.yml \ No newline at end of file diff --git a/molecule/opensuse-leap-15.2/converge.yml b/molecule/opensuse-leap-15.2/converge.yml deleted file mode 120000 index 73cb8da..0000000 --- a/molecule/opensuse-leap-15.2/converge.yml +++ /dev/null @@ -1 +0,0 @@ -../default/converge.yml \ No newline at end of file diff --git a/molecule/opensuse-leap-15.2/group_vars/all/00-defaults.yml b/molecule/opensuse-leap-15.2/group_vars/all/00-defaults.yml deleted file mode 120000 index 796af02..0000000 --- a/molecule/opensuse-leap-15.2/group_vars/all/00-defaults.yml +++ /dev/null @@ -1 +0,0 @@ -../../../../defaults/main.yml \ No newline at end of file diff --git a/molecule/opensuse-leap-15.2/group_vars/all/99-molecule.yml b/molecule/opensuse-leap-15.2/group_vars/all/99-molecule.yml deleted file mode 100644 index 858af07..0000000 --- a/molecule/opensuse-leap-15.2/group_vars/all/99-molecule.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- - -# (c) Wong Hoi Sing Edison -# -# 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. diff --git a/molecule/opensuse-leap-15.2/molecule.yml b/molecule/opensuse-leap-15.2/molecule.yml deleted file mode 100644 index 980269b..0000000 --- a/molecule/opensuse-leap-15.2/molecule.yml +++ /dev/null @@ -1,58 +0,0 @@ ---- - -# (c) Wong Hoi Sing Edison -# -# 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. - -driver: - name: vagrant - provider: - name: libvirt -platforms: - - name: ${MOLECULE_INSTANCE_NAME}-1 - box: alvistack/opensuse-leap-15.2 - cpu: 2 - memory: 8192 - provider_raw_config_args: - - "disk_bus = 'virtio'" - - "nic_model_type = 'virtio'" - - "video_type = 'virtio'" - - "disk_driver :cache => 'writeback'" - - "storage :file, bus: 'virtio', cache: 'writeback'" -lint: | - set -euxo pipefail - yamllint . - ansible-lint - flake8 -dependency: - name: galaxy - options: - role-file: ansible-galaxy-requirements.yml - roles-path: ${HOME}/.ansible/roles - requirements-file: ansible-galaxy-requirements.yml - collections-path: ${HOME}/.ansible/collections - ignore-errors: true - force: false -provisioner: - name: ansible - config_options: - defaults: - forks: 20 - ssh_connection: - pipelining: true - ssh_args: -o ControlMaster=auto -o ControlPersist=600s - inventory: - links: - group_vars: group_vars -verifier: - name: ansible diff --git a/molecule/opensuse-leap-15.2/prepare.yml b/molecule/opensuse-leap-15.2/prepare.yml deleted file mode 120000 index 1c017d9..0000000 --- a/molecule/opensuse-leap-15.2/prepare.yml +++ /dev/null @@ -1 +0,0 @@ -../default/prepare.yml \ No newline at end of file diff --git a/molecule/opensuse-leap-15.2/verify.yml b/molecule/opensuse-leap-15.2/verify.yml deleted file mode 120000 index 15a7868..0000000 --- a/molecule/opensuse-leap-15.2/verify.yml +++ /dev/null @@ -1 +0,0 @@ -../default/verify.yml \ No newline at end of file diff --git a/vars/suse-15.2.yml b/vars/suse-15.2.yml deleted file mode 100644 index 6909b6b..0000000 --- a/vars/suse-15.2.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- - -# (c) Wong Hoi Sing Edison -# -# 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. - -_rpm_key: - - key: "http://download.opensuse.org/repositories/server:/database/openSUSE_Leap_15.2/repodata/repomd.xml.key" - fingerprint: "116EB86331583E47E63CDF4D562111AC05905EA8" - state: "present" - -_yum_repository: - - file: "server_database" - name: "server_database" - description: "Databases (openSUSE_Leap_15.2)" - baseurl: "http://download.opensuse.org/repositories/server:database/openSUSE_Leap_15.2" - enabled: true - priority: "2" - module_hotfixes: true - gpgcheck: true - gpgkey: "http://download.opensuse.org/repositories/server:/database/openSUSE_Leap_15.2/repodata/repomd.xml.key" - state: "present" - -_zypper: - - { state: "latest", name: "kapacitor" } - - { state: "latest", name: "kapacitor-client" }