Skip to content

Commit

Permalink
ci: drop el8
Browse files Browse the repository at this point in the history
Drop el8
Build ci on ubuntu-latest

Signed-off-by: Jean-Louis Dupond <jean-louis@dupond.be>
  • Loading branch information
dupondje committed Jan 24, 2025
1 parent 18107de commit 9c87a19
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 24 deletions.
17 changes: 6 additions & 11 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,13 @@ on:
workflow_dispatch:
jobs:
sanity_test:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
name: ansible-test docker
steps:
- name: Install Python 3.9
- name: Install Python
run: |
sudo apt-get update
sudo apt-get install software-properties-common -y
sudo add-apt-repository ppa:deadsnakes/ppa
sudo apt-get install python3.9-venv -y
sudo apt-get install python3-venv -y
- name: Install ansible.posix
run: ansible-galaxy collection install -c ansible.posix
Expand All @@ -36,8 +34,8 @@ jobs:
- name: Run ansible-lint 6.y.z
run: |
set -e
# Activate Python 3.9 virtualenv and run ansible-lint there
python3.9 -m venv venv
# Activate Python 3 virtualenv and run ansible-lint there
python3 -m venv venv
source venv/bin/activate
cd /tmp/ansible_collections/ovirt/ovirt/
pip3 install --upgrade pip
Expand All @@ -59,17 +57,14 @@ jobs:
fail-fast: false
matrix:
include:
- name: centos-stream-8
pip-command: pip3.9
container-name: el8stream
- name: centos-stream-9
pip-command: pip3
container-name: el9stream
name: ${{ matrix.name }}
container:
image: quay.io/ovirt/buildcontainer:${{ matrix.container-name }}
steps:
- name: Install python3.9 modules
- name: Install python3 modules
run: ${{ matrix.pip-command }} install pycodestyle pylint voluptuous yamllint rstcheck antsibull-changelog rich "ansible-lint>=6.0.0,<7.0.0" cryptography

- name: Install ansible.posix
Expand Down
1 change: 0 additions & 1 deletion bindep.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ gcc [compile platform:rpm]
libcurl-devel [compile platform:rpm]
libxml2-devel [compile platform:rpm]
openssl-devel [compile platform:rpm]
python39-devel [compile platform:centos-8 platform:rhel-8]
python3-devel [compile platform:centos-9 platform:rhel-9]
qemu-img [platform:rpm]
13 changes: 1 addition & 12 deletions ovirt-ansible-collection.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,19 @@ Url: http://www.ovirt.org

BuildRequires: ansible-core
BuildRequires: ansible-test
%if 0%{?rhel} > 7 && 0%{?rhel} < 9
BuildRequires: glibc-langpack-en
%endif

Requires: ansible-core >= 2.13.0
Requires: ansible-collection-ansible-netcommon
Requires: ansible-collection-ansible-posix
Requires: ansible-collection-ansible-utils
Requires: qemu-img
Requires: python3-jmespath
Requires: python3-jmespath

%if 0%{?rhel} >= 9
Requires: python3.11-ovirt-imageio-client
Requires: python3.11-ovirt-engine-sdk4 >= 4.5.0
Requires: python3.11-jmespath
Requires: python3.11-passlib
%endif

%if 0%{?rhel} < 9
Requires: python3.11-ovirt-imageio-client
Requires: python3.11-ovirt-engine-sdk4 >= 4.5.0
Requires: python3.11-jmespath
Requires: python3.11-passlib
%endif

Obsoletes: ansible < 2.10.0
Obsoletes: ovirt-ansible-cluster-upgrade
Expand Down

0 comments on commit 9c87a19

Please sign in to comment.