build: update build flow

.github/workflows/ci.yaml

@@ -1,34 +1,92 @@
 ---
-name: CI
+name: build
+
 on:
   push:
     branches: [master]
+    tags: ['*']
   pull_request:
     branches: [master]
   workflow_dispatch:
 
-env:
-  EXPORT_DIR: exported-artifacts
 jobs:
   build:
     runs-on: ubuntu-latest
-    name: rpm-${{ matrix.distro }}
-    container: quay.io/ovirt/buildcontainer:${{ matrix.distro }}
     strategy:
       fail-fast: false
       matrix:
-        distro: [el9stream, el10stream]
+        include:
+          - name: almalinux-9
+            shortcut: el9
+            container-name: almalinux9
+          - name: almalinux-10
+            shortcut: el10
+            container-name: almalinux10
+          - name: centos-stream-9
+            shortcut: el9s
+            container-name: el9stream
+          - name: centos-stream-10
+            shortcut: el10s
+            container-name: el10stream
+
+    name: Build and test on ${{ matrix.name }}
+    container:
+      image: quay.io/ovirt/buildcontainer:${{ matrix.container-name }}
+
     steps:
-      - uses: ovirt/checkout-action@main
-        with:
-          fetch-depth: 0
+      - name: Checkout sources
+        uses: actions/checkout@v7
+
       - name: Mark repository as safe
         run: git config --global --add safe.directory "$(pwd)"
-      - name: Install tox
-        run: pip3 install tox
-      - name: Check patch
-        run: ./automation/check-patch.sh
+
+      - name: Install dnf dependencies
+        run: dnf install -y autoconf automake gettext-devel git systemd make rpm-build libtool python3-devel python3-pip
+
+      - name: Install python dependencies
+        run: pip install tox
+
+      - name: Set build environment
+        run: |
+          TAG=$(git tag --points-at HEAD | head -1)
+          if [[ -n "$TAG" ]]; then
+            if [[ "$TAG" =~ -([0-9]+)$ ]]; then
+              echo "PACKAGE_RPM_RELEASE=${BASH_REMATCH[1]}" >> $GITHUB_ENV
+            else
+              echo "PACKAGE_RPM_RELEASE=1" >> $GITHUB_ENV
+            fi
+          else
+            echo "RELEASE_SUFFIX=.$(date --utc +%Y%m%d%H%M%S).git$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+          fi
+
+      - name: Autogen
+        run: ./autogen.sh
+
+      - name: Configure
+        run: ./configure
+
+      - name: Run tests
+        run: tox
+
+      - name: Build RPM
+        run: make -j rpm
+
+      - name: Collect artifacts
+        run: |
+          mkdir -p exported-artifacts
+          find tmp.repos -iname \*rpm -exec mv "{}" exported-artifacts/ \;
+          mv ./*tar.gz exported-artifacts/
+
       - name: Upload artifacts
-        uses: ovirt/upload-rpms-action@main
+        uses: actions/upload-artifact@v7
         with:
-          directory: ${{ env.EXPORT_DIR }}
+          name: rpm-${{ matrix.shortcut }}
+          path: exported-artifacts
+
+  publish-rpms:
+    permissions:
+      artifact-metadata: read
+    needs: build
+    if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
+    uses: ovirt/ovirt-workflows/.github/workflows/publish-rpms.yml@main
+    secrets: inherit

.gitignore

@@ -33,9 +33,6 @@ contrib/mom-rpcclient.py
 mom-guestd
 momd
 
-# Not autogenerated!
-\!.copr/Makefile
-
 # Autogenerated files from tox testing
 .tox
 .coverage

Makefile.am

@@ -43,3 +43,23 @@ dist_doc_DATA = \
 	COPYING \
 	README.md \
 	$(NULL)
+
+TMPREPOS = tmp.repos
+RPMBUILD_ARGS := --define="_topdir `pwd`/$(TMPREPOS)"
+RPMBUILD_ARGS += $(if $(RELEASE_SUFFIX),--define="release_suffix $(RELEASE_SUFFIX)")
+
+rpm: srpm
+	rpmbuild $(RPMBUILD_ARGS) --rebuild "$(TMPREPOS)"/SRPMS/*.src.rpm
+	cp $(distdir).tar.gz $(TMPREPOS)/SOURCES/
+	@echo
+	@echo "rpm available at '$(TMPREPOS)'"
+	@echo
+
+srpm: dist
+	rm -rf "$(TMPREPOS)"
+	mkdir -vp $(TMPREPOS)/{SPECS,RPMS,SRPMS,SOURCES}
+	rpmbuild $(RPMBUILD_ARGS) -ts $(distdir).tar.gz
+	@echo
+	@echo "srpm available at '$(TMPREPOS)'"
+
+.PHONY: rpm srpm

README.md

@@ -1,7 +1,6 @@
 Memory Overcommitment Manager
 =============================
 
-[![Copr build status](https://copr.fedorainfracloud.org/coprs/ovirt/ovirt-master-snapshot/package/mom/status_image/last_build.png)](https://copr.fedorainfracloud.org/coprs/ovirt/ovirt-master-snapshot/package/mom/)
 
 
 Welcome to the oVirt MOM source repository. This repository is hosted on

configure.ac

@@ -19,15 +19,17 @@ define([VERSION_MAJOR], [0])
 define([VERSION_MINOR], [6])
 define([VERSION_FIX], [6])
 define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX)
-define([VERSION_SUFFIX], [_master])
 
-AC_INIT([mom], VERSION_NUMBER[]VERSION_SUFFIX, [mom-devel@googlegroups.com])
+AC_INIT([mom], VERSION_NUMBER, [devel@ovirt.org])
 PACKAGE_RPM_VERSION="VERSION_NUMBER"
-PACKAGE_RPM_RELEASE="0.0.$(echo VERSION_SUFFIX | sed 's/^_//')"
-RELEASE_SUFFIX="VERSION_SUFFIX"
+
+AC_ARG_VAR([PACKAGE_RPM_RELEASE],
+    [RPM release field (default: 0.master for development, release number for release builds)])
+AS_IF([test -z "$PACKAGE_RPM_RELEASE"],
+    [PACKAGE_RPM_RELEASE="0.master"])
+
 AC_SUBST([PACKAGE_RPM_VERSION])
 AC_SUBST([PACKAGE_RPM_RELEASE])
-AC_SUBST([RELEASE_SUFFIX])
 
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_SRCDIR([mom/GuestManager.py])
@@ -43,7 +45,7 @@ AC_ARG_ENABLE(
 
 AC_PROG_INSTALL
 
-AM_PATH_PYTHON([2.6])
+AM_PATH_PYTHON([3.9])
 
 AC_ARG_VAR([PYFLAKES], [path to pyflakes utility])
 AC_CHECK_PROGS([PYFLAKES], [pyflakes])