WIP: Branch 4.5 again

This patch is not intended to be merged to master branch. Instead, it's intended to be merged to a new 4.5 branch, replacing current ovirt-4.5, which would be branched from current master. It should represent all the intended differences between 4.5 and master. The immediate reason is oVirt#94 . While working on cherry-picking the patches there to 4.5, I realized there are many more patches in master not cherry-picked to 4.5, and at least some of those I checked, made sense to also be in 4.5. So current patch is an alternative to this pick-and-choose process. Change-Id: Id6ba5fd06ef40e403a4e085aecfb64ec84b5056c Signed-off-by: Yedidyah Bar David <[email protected]>
didib · Dec 15, 2022 · 718cd6b · didib · Dec 15, 2022 · didib
1 parent e0f25d4
commit 718cd6b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ on:
       keep_workdir:
         required: false
   push:
-    branches: [master]
+    branches: [ovirt-4.5]
   schedule:
     # Running every morning in EMEA timezone
     - cron: '0 6 * * *'
@@ -68,7 +68,7 @@ jobs:
           key: ${{ secrets.SSH_KEY_FOR_RESOURCES_OVIRT_ORG }}
           known_hosts: ${{ secrets.KNOWN_HOSTS_FOR_RESOURCES_OVIRT_ORG }}
           source: engine-appliance/tmp.repos/RPMS/x86_64/*.rpm
-          target: github-ci/ovirt-appliance/${{ matrix.name }}
+          target: github-ci/ovirt-appliance-4.5/${{ matrix.name }}
           cleanup: yes
           createrepo: yes
           # keep 10 last builds + repodata

diff --git a/engine-appliance/data/distro-defs.yml b/engine-appliance/data/distro-defs.yml
@@ -10,8 +10,8 @@ centos-stream-8:
   packages:
     - python36
     - centos-stream-repos
-  ovirtreleaserpm: ovirt-release-master
-  ovirtreleaserpmrepo: https://download.copr.fedorainfracloud.org/results/ovirt/ovirt-master-snapshot/centos-stream-8-x86_64/
+  ovirtreleaserpm: centos-release-ovirt45-testing
+  ovirtreleaserpmrepo: https://buildlogs.centos.org/centos/8-stream/extras/x86_64/extras-common/
 
 centos-stream-9:
   url: --metalink=https://mirrors.centos.org/metalink?repo=centos-baseos-9-stream&arch=$basearch&protocol=https,http
@@ -23,5 +23,5 @@ centos-stream-9:
   packages:
     - python3
     - centos-stream-repos
-  ovirtreleaserpm: ovirt-release-master
-  ovirtreleaserpmrepo: https://download.copr.fedorainfracloud.org/results/ovirt/ovirt-master-snapshot/centos-stream-9-x86_64/
+  ovirtreleaserpm: centos-release-ovirt45-testing
+  ovirtreleaserpmrepo: https://buildlogs.centos.org/centos/9-stream/extras/x86_64/extras-common/
diff --git a/engine-appliance/data/ovirt-engine-appliance.j2 b/engine-appliance/data/ovirt-engine-appliance.j2
@@ -133,7 +133,6 @@ set -xe
 dnf repolist
 
 
-rpm --import https://download.copr.fedorainfracloud.org/results/ovirt/ovirt-master-snapshot/pubkey.gpg
 dnf --repofrompath=ovirt-release-repo,{{ data["ovirtreleaserpmrepo"] }} install -y {{ data["ovirtreleaserpm"] }}
 dnf config-manager --set-enabled powertools || true