From 40f8d6f10f0ad687e9bfc0f711fbe19257abb8a7 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Mon, 2 Jan 2023 18:01:18 -0800 Subject: Run the spec-rpm-mismatch report daily on duvel The report will be available at https://pkgsubmit.mageia.org/spec-rpm-mismatch.html --- manifests/nodes/duvel.pp | 1 + modules/spec-tree-reports/manifests/init.pp | 50 ++++++++++++++++++++++ .../templates/generate-spec-rpm-mismatch-report | 9 ++++ 3 files changed, 60 insertions(+) create mode 100644 modules/spec-tree-reports/manifests/init.pp create mode 100644 modules/spec-tree-reports/templates/generate-spec-rpm-mismatch-report diff --git a/manifests/nodes/duvel.pp b/manifests/nodes/duvel.pp index 4aa85cad..70bbb242 100644 --- a/manifests/nodes/duvel.pp +++ b/manifests/nodes/duvel.pp @@ -19,6 +19,7 @@ node duvel { include mga_buildsystem::mainnode include softwarekey include mgasoft + include spec-tree-reports include access_classes::committers include restrictshell::allow_git diff --git a/modules/spec-tree-reports/manifests/init.pp b/modules/spec-tree-reports/manifests/init.pp new file mode 100644 index 00000000..5623090b --- /dev/null +++ b/modules/spec-tree-reports/manifests/init.pp @@ -0,0 +1,50 @@ +# spec-rpm-mismatch is a report that compares the versions of RPMs available +# in the repository versus the versions created by the latest spec files and +# shows those that don't match. + +class spec-tree-reports( + $report = '/var/www/bs/spec-rpm-mismatch.html', + $srpms = 'file:///distrib/bootstrap/distrib/{version}/SRPMS/{media}/{section}/', + $release = "mga${buildsystem::var::distros::distros['cauldron']['version']}", +) { + $user = 'spec-tree-reports' + $home = "/var/lib/${user}" + $hour = 6 + $minute = 39 + + user { $user: + comment => 'spec-tree report generator', + home => $home, + } + + file { $home: + ensure => directory, + owner => $user, + mode => '0755', + } + + package { 'spec-tree': + ensure => installed, + } + + file { "${report}": + ensure => present, + owner => $user, + mode => '0644', + replace => false, + content => '*', + } + + mga_common::local_script { 'generate-spec-rpm-mismatch-report': + content => template('spec-tree-reports/generate-spec-rpm-mismatch-report'), + } + + cron { "rpm_mismatch_report": + command => "/usr/local/bin/generate-spec-rpm-mismatch-report | systemd-cat -t generate-spec-rpm-mismatch-report", + hour => $hour, + minute => $minute, + user => $user, + environment => "MAILTO=root", + require => User[$user], + } +} diff --git a/modules/spec-tree-reports/templates/generate-spec-rpm-mismatch-report b/modules/spec-tree-reports/templates/generate-spec-rpm-mismatch-report new file mode 100644 index 00000000..25f866d0 --- /dev/null +++ b/modules/spec-tree-reports/templates/generate-spec-rpm-mismatch-report @@ -0,0 +1,9 @@ +#!/bin/bash +# GENERATED BY PUPPET--DO NOT EDIT +set -e +trap 'test "$?" -ne 0 && echo Error in script' EXIT + +cd "$HOME" +/usr/bin/generate-mismatch-report --srpm_source <%= scope.function_shellquote([scope.lookupvar('srpms')]) -%> --release <%= scope.function_shellquote([scope.lookupvar('release')]) %> +cp report.html <%= scope.function_shellquote([scope.lookupvar('report')]) %> +rm -f report.html -- cgit v1.2.1