From 5acd5f0d02defa3f71e8e9f9e70178555adc87cd Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 8 Aug 2022 12:20:47 +0200
Subject: [PATCH] StagingBot: call staging rebuild first (support random fails)
 and handle Factory:NonFree

---
 gocd/staging.bot.gocd.yaml     | 60 ++++++++++++++++++++++++++++++++++
 gocd/staging.bot.gocd.yaml.erb |  3 +-
 2 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/gocd/staging.bot.gocd.yaml b/gocd/staging.bot.gocd.yaml
index 3f6e84a8..18fefc7d 100644
--- a/gocd/staging.bot.gocd.yaml
+++ b/gocd/staging.bot.gocd.yaml
@@ -51,11 +51,69 @@ pipelines:
                ln -s $PWD/osclib $tempdir/.osc-plugins
                export HOME=$tempdir
 
+               osc -A https://api.opensuse.org staging -p openSUSE:Factory rebuild
                osc -A https://api.opensuse.org staging -p openSUSE:Factory list --supersede
                osc -A https://api.opensuse.org staging -p openSUSE:Factory adi
                osc -A https://api.opensuse.org staging -p openSUSE:Factory unselect --cleanup
                osc -A https://api.opensuse.org staging -p openSUSE:Factory repair --cleanup
                rm -rf $tempdir
+  AdiChecker.Factory.NonFree:
+    group: openSUSE.Checkers
+    lock_behavior: unlockWhenFinished
+    environment_variables:
+      OSC_CONFIG: /home/go/config/oscrc-repo-checker
+    materials:
+      script:
+        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        destination: scripts
+      repos:
+        git: git://botmaster.suse.de/opensuse-repos.git
+        auto_update: true
+        whitelist:
+          - openSUSE:Factory:NonFree:Staging:adi*.yaml
+        destination: repos
+    stages:
+    - Run:
+        jobs:
+          Run:
+            resources:
+            - repo-checker
+            tasks:
+            - script: |-
+                ./scripts/staging-installcheck.py -A https://api.opensuse.org -p openSUSE:Factory:NonFree
+  SBot.Regular.Factory.NonFree:
+    group: openSUSE.Checkers
+    lock_behavior: unlockWhenFinished
+    timer:
+      spec: 0 0 * ? * *
+    environment_variables:
+      OSC_CONFIG: /home/go/config/oscrc-staging-bot
+    materials:
+      git:
+        git: https://github.com/openSUSE/openSUSE-release-tools.git
+    stages:
+    - Run:
+        approval:
+          type: manual
+        jobs:
+          Run:
+            resources:
+            - staging-bot
+            tasks:
+            - script: |-
+               set -e
+               tempdir=$(mktemp -d)
+               mkdir -p $tempdir/.osc-plugins
+               ln -s $PWD/osc-staging.py $tempdir/.osc-plugins
+               ln -s $PWD/osclib $tempdir/.osc-plugins
+               export HOME=$tempdir
+
+               osc -A https://api.opensuse.org staging -p openSUSE:Factory:NonFree rebuild
+               osc -A https://api.opensuse.org staging -p openSUSE:Factory:NonFree list --supersede
+               osc -A https://api.opensuse.org staging -p openSUSE:Factory:NonFree adi
+               osc -A https://api.opensuse.org staging -p openSUSE:Factory:NonFree unselect --cleanup
+               osc -A https://api.opensuse.org staging -p openSUSE:Factory:NonFree repair --cleanup
+               rm -rf $tempdir
   AdiChecker.Backports.SLE-15-SP5:
     group: openSUSE.Checkers
     lock_behavior: unlockWhenFinished
@@ -107,6 +165,7 @@ pipelines:
                ln -s $PWD/osclib $tempdir/.osc-plugins
                export HOME=$tempdir
 
+               osc -A https://api.opensuse.org staging -p openSUSE:Backports:SLE-15-SP5 rebuild
                osc -A https://api.opensuse.org staging -p openSUSE:Backports:SLE-15-SP5 list --supersede
                osc -A https://api.opensuse.org staging -p openSUSE:Backports:SLE-15-SP5 adi
                osc -A https://api.opensuse.org staging -p openSUSE:Backports:SLE-15-SP5 unselect --cleanup
@@ -163,6 +222,7 @@ pipelines:
                ln -s $PWD/osclib $tempdir/.osc-plugins
                export HOME=$tempdir
 
+               osc -A https://api.opensuse.org staging -p openSUSE:Leap:15.5 rebuild
                osc -A https://api.opensuse.org staging -p openSUSE:Leap:15.5 list --supersede
                osc -A https://api.opensuse.org staging -p openSUSE:Leap:15.5 adi
                osc -A https://api.opensuse.org staging -p openSUSE:Leap:15.5 unselect --cleanup
diff --git a/gocd/staging.bot.gocd.yaml.erb b/gocd/staging.bot.gocd.yaml.erb
index 13163619..aabc500e 100644
--- a/gocd/staging.bot.gocd.yaml.erb
+++ b/gocd/staging.bot.gocd.yaml.erb
@@ -1,6 +1,6 @@
 format_version: 3
 pipelines:
-<% %w(Factory Backports:SLE-15-SP5 Leap:15.5).each do |project| -%>
+<% %w(Factory Factory:NonFree Backports:SLE-15-SP5 Leap:15.5).each do |project| -%>
 <% nickname =  project.gsub(':', '.') -%>
   AdiChecker.<%= nickname %>:
     group: openSUSE.Checkers
@@ -53,6 +53,7 @@ pipelines:
                ln -s $PWD/osclib $tempdir/.osc-plugins
                export HOME=$tempdir
 
+               osc -A https://api.opensuse.org staging -p openSUSE:<%= project %> rebuild
                osc -A https://api.opensuse.org staging -p openSUSE:<%= project %> list --supersede
                osc -A https://api.opensuse.org staging -p openSUSE:<%= project %> adi
                osc -A https://api.opensuse.org staging -p openSUSE:<%= project %> unselect --cleanup