diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4c850c0..1ad831e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: - name: fix loop mounts run: for i in `seq 0 9`; do [[ ! -b /dev/loop$i ]] && mknod /dev/loop$i -m0660 b 7 $i; done - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -67,7 +67,7 @@ jobs: keep_files_count: 11 - name: Upload manifest to github - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: "manifest${{ matrix.name }}" path: | diff --git a/engine-appliance/Makefile b/engine-appliance/Makefile index 18f90c7..0071c95 100644 --- a/engine-appliance/Makefile +++ b/engine-appliance/Makefile @@ -32,7 +32,7 @@ LMC_CPUS ?= 4 # # oVirt specific vars # -OVIRTRELEASERPM=centos-release-ovirt45-testing +OVIRTRELEASERPM=centos-release-ovirt45 ovirt-engine-appliance.spec: VERSION=4.5 ovirt-engine-appliance.spec: VERSION_EXTRA= ovirt-engine-appliance.spec: RELEASE=$(shell date +%Y%m%d%H%M%S).1 diff --git a/engine-appliance/data/ovirt-engine-appliance.j2 b/engine-appliance/data/ovirt-engine-appliance.j2 index badd6ea..d8e59b0 100644 --- a/engine-appliance/data/ovirt-engine-appliance.j2 +++ b/engine-appliance/data/ovirt-engine-appliance.j2 @@ -133,9 +133,7 @@ set -xe # For build issues debugging purpose, looking for known repositories dnf repolist -dnf --repofrompath=extras-common-testing,https://buildlogs.centos.org/centos/8-stream/extras/x86_64/extras-common/ install -y --nogpgcheck {{ releaserpm }} -dnf config-manager --set-enabled centos-ovirt45-testing -dnf config-manager --set-enabled ovirt-45-upstream-testing +dnf install -y {{ releaserpm }} dnf -y update diff --git a/engine-appliance/data/ovirt-engine-appliance.spec.in b/engine-appliance/data/ovirt-engine-appliance.spec.in index 2d75c37..033bc92 100644 --- a/engine-appliance/data/ovirt-engine-appliance.spec.in +++ b/engine-appliance/data/ovirt-engine-appliance.spec.in @@ -5,7 +5,7 @@ Name: ovirt-engine-appliance Version: @VERSION@ Release: @RELEASE@%{?dist}%{?extra_release} -License: GPLv2 +License: GPL-2.0-only Summary: The oVirt Engine Appliance image (OVA) Group: Applications/System URL: https://www.ovirt.org/ @@ -55,8 +55,5 @@ rm -rf %{buildroot} %doc ovirt-engine-appliance-manifest-rpm %changelog -* Mon Apr 20 2022 Sandro Bonazzola - 4.5-@RELEASE@ -- oVirt Engine Appliance 4.5 GA - -* Tue Sep 07 2021 Sandro Bonazzola - 4.5 -- oVirt Engine Appliance 4.5 +* Fri Dec 01 2023 Sandro Bonazzola - 4.5-@RELEASE@ +- oVirt Engine Appliance 4.5.5 GA