Skip to content

Commit

Permalink
ci: drop centos 8
Browse files Browse the repository at this point in the history
Signed-off-by: Jean-Louis Dupond <[email protected]>
  • Loading branch information
dupondje committed Nov 20, 2024
1 parent 9897045 commit 5e4ab15
Show file tree
Hide file tree
Showing 14 changed files with 16 additions and 210 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distro: [centos-8, centos-9, alma-9]
distro: [centos-9, alma-9]
container: quay.io/ovirt/vdsm-test:${{ matrix.distro }}
steps:
- uses: ovirt/checkout-action@main
Expand All @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distro: [centos-8, centos-9, alma-9]
distro: [centos-9, alma-9]
container:
image: quay.io/ovirt/vdsm-test:${{ matrix.distro }}
# Required to create loop devices.
Expand All @@ -40,7 +40,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distro: [centos-8, centos-9, alma-9]
distro: [centos-9, alma-9]
container:
image: quay.io/ovirt/vdsm-test:${{ matrix.distro }}
# Required to create loop devices.
Expand All @@ -56,7 +56,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distro: [centos-8, centos-9, alma-9]
distro: [centos-9, alma-9]
container:
image: quay.io/ovirt/vdsm-test:${{ matrix.distro }}
# Needed for many operations, i.e. creating bridges
Expand All @@ -71,8 +71,6 @@ jobs:
fail-fast: false
matrix:
include:
- name: el8
container-name: el8stream
- name: el9
container-name: el9stream
name: ${{ matrix.name }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
uses: redhat-actions/push-to-registry@v2
with:
image: ovirt/vdsm-network-tests-${{ matrix.container }}
tags: alma-9 centos-8 centos-9
tags: alma-9 centos-9
registry: ${{ env.IMAGE_REGISTRY }}
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_TOKEN }}
Expand All @@ -44,7 +44,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
distro: [ centos-8, centos-9, alma-9 ]
distro: [ centos-9, alma-9 ]
steps:
- uses: ovirt/checkout-action@main
- name: Install dependencies
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/network.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,7 @@ jobs:
fail-fast: false
matrix:
type: [ unit, integration, functional ]
tag: [ alma-9, centos-8 ]
include:
- type: unit
tag: centos-9
- type: integration
tag: centos-9
tag: [ alma-9, centos-9 ]
steps:
- uses: ovirt/checkout-action@main
- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: Red Hat, Inc.
# SPDX-License-Identifier: GPL-2.0-or-later

image: quay.io/ovirt/vdsm-test-centos-8
image: quay.io/ovirt/vdsm-test-centos-9

variables:
TRAVIS_CI: 1
Expand All @@ -19,7 +19,7 @@ rpm:
script:
- ./ci/rpm.sh
artifacts:
name: "rpm-centos-8"
name: "rpm-centos-9"
paths:
- "$EXPORT_DIR/"
expire_in: 1 week
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ date, please check the [Gerrit vdsm project](https://gerrit.ovirt.org/q/project:

Add ovirt repositories to your repositories list.

For CentOS Stream 8 use:
For CentOS Stream 9 use:

sudo dnf copr enable -y ovirt/ovirt-master-snapshot centos-stream-8
sudo dnf copr enable -y ovirt/ovirt-master-snapshot centos-stream-9
sudo dnf install -y ovirt-release-master

For more info see
Expand Down
80 changes: 0 additions & 80 deletions docker/Dockerfile.centos-8

This file was deleted.

2 changes: 1 addition & 1 deletion docker/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: Red Hat, Inc.
# SPDX-License-Identifier: GPL-2.0-or-later

targets := alma-9 centos-8 centos-9
targets := alma-9 centos-9
prefix := ovirt/vdsm-test

.PHONY: $(targets) push
Expand Down
2 changes: 1 addition & 1 deletion docker/network/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
CONTAINER_CMD := podman
PREFIX := ovirt/vdsm-network-tests

targets := alma-9 centos-8 centos-9
targets := alma-9 centos-9
types := functional integration unit

.PHONY: $(targets) $(types)
Expand Down
39 changes: 0 additions & 39 deletions docker/network/functional/Dockerfile.centos-8

This file was deleted.

36 changes: 0 additions & 36 deletions docker/network/integration/Dockerfile.centos-8

This file was deleted.

32 changes: 0 additions & 32 deletions docker/network/unit/Dockerfile.centos-8

This file was deleted.

2 changes: 1 addition & 1 deletion tests/network/functional/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

source tests/network/common.sh

IMAGE_TAG="${IMAGE_TAG:=centos-8}"
IMAGE_TAG="${IMAGE_TAG:=centos-9}"
CONTAINER_IMAGE="${CONTAINER_IMAGE:=$IMAGE_PREFIX-functional}"
NMSTATE_WORKSPACE="/workspace/nmstate"
NMSTATE_TMP="/nmstate-tmp"
Expand Down
2 changes: 1 addition & 1 deletion tests/network/integration/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

source tests/network/common.sh

IMAGE_TAG="${IMAGE_TAG:=centos-8}"
IMAGE_TAG="${IMAGE_TAG:=centos-9}"
CONTAINER_IMAGE="${CONTAINER_IMAGE:=$IMAGE_PREFIX-integration}"

load_kernel_modules
Expand Down
2 changes: 1 addition & 1 deletion tests/network/unit/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

source tests/network/common.sh

IMAGE_TAG="${IMAGE_TAG:=centos-8}"
IMAGE_TAG="${IMAGE_TAG:=centos-9}"
CONTAINER_IMAGE="${CONTAINER_IMAGE:=$IMAGE_PREFIX-unit}"

function patch_dist_commons {
Expand Down

0 comments on commit 5e4ab15

Please sign in to comment.