Merge pull request #3136 from wengel/Backports_SP7

Adding openSUSE:Backports:SLE-15-SP7 for install-check
openSUSE · Aug 15, 2024 · d3ff6c6 · d3ff6c6
2 parents 376cbb3 + 5ee261d
commit d3ff6c6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 72 deletions.
diff --git a/gocd/rebuild-trigger.gocd.yaml b/gocd/rebuild-trigger.gocd.yaml
@@ -143,7 +143,7 @@ pipelines:
               ./project-installcheck.py --debug check --store home:repo-checker/rebuilds -r openSUSE_PPC GNOME:Factory
               ./project-installcheck.py --debug check --store home:repo-checker/rebuilds -r openSUSE_Factory GNOME:Next
               ./project-installcheck.py --debug check --store home:repo-checker/rebuilds -r openSUSE_PPC GNOME:Next
-  Trigger.Rebuild.SLE_15_SP6_Backports:
+  Trigger.Rebuild.SLE_15_SP7_Backports:
     group: openSUSE.Checkers
     lock_behavior: unlockWhenFinished
     environment_variables:
@@ -161,10 +161,10 @@ pipelines:
           - repo-checker
         tasks:
           - script: |-
-              echo "SLE15 SP6 Backports"
-              ./project-installcheck.py --debug check --store openSUSE:Backports:SLE-15-SP6:Staging/dashboard --no-rebuild openSUSE:Backports:SLE-15-SP6
-              echo "SLE15 SP6 Step Backports (Rebuilds)"
-              ./project-installcheck.py --debug check --store home:repo-checker/rebuilds -r step openSUSE:Backports:SLE-15-SP6
+              echo "SLE15 SP7 Backports"
+              ./project-installcheck.py --debug check --store openSUSE:Backports:SLE-15-SP7:Staging/dashboard --no-rebuild openSUSE:Backports:SLE-15-SP7
+              echo "SLE15 SP7 Step Backports (Rebuilds)"
+              ./project-installcheck.py --debug check --store home:repo-checker/rebuilds -r step openSUSE:Backports:SLE-15-SP7
   Trigger.Rebuild.Step:
     group: openSUSE.Checkers
     lock_behavior: unlockWhenFinished

diff --git a/gocd/staging.bot.gocd.yaml b/gocd/staging.bot.gocd.yaml
@@ -114,7 +114,7 @@ pipelines:
                 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-SP6:
+  AdiChecker.Backports.SLE-15-SP7:
     group: openSUSE.Checkers
     lock_behavior: unlockWhenFinished
     environment_variables:
@@ -127,7 +127,7 @@ pipelines:
         git: git://botmaster.suse.de/opensuse-repos.git
         auto_update: true
         whitelist:
-          - openSUSE:Backports:SLE-15-SP6:Staging:adi*.yaml
+          - openSUSE:Backports:SLE-15-SP7:Staging:adi*.yaml
         destination: repos
     stages:
     - Run:
@@ -137,8 +137,8 @@ pipelines:
             - repo-checker
             tasks:
             - script: |-
-                ./scripts/staging-installcheck.py -A https://api.opensuse.org -p openSUSE:Backports:SLE-15-SP6
-  SBot.Regular.Backports.SLE-15-SP6:
+                ./scripts/staging-installcheck.py -A https://api.opensuse.org -p openSUSE:Backports:SLE-15-SP7
+  SBot.Regular.Backports.SLE-15-SP7:
     group: openSUSE.Checkers
     lock_behavior: unlockWhenFinished
     timer:
@@ -165,66 +165,9 @@ pipelines:
                 ln -s $PWD/osclib $tempdir/.osc-plugins
                 export HOME=$tempdir
 
-                osc -A https://api.opensuse.org staging -p openSUSE:Backports:SLE-15-SP6 rebuild
-                osc -A https://api.opensuse.org staging -p openSUSE:Backports:SLE-15-SP6 list --supersede
-                osc -A https://api.opensuse.org staging -p openSUSE:Backports:SLE-15-SP6 adi
-                osc -A https://api.opensuse.org staging -p openSUSE:Backports:SLE-15-SP6 unselect --cleanup
-                osc -A https://api.opensuse.org staging -p openSUSE:Backports:SLE-15-SP6 repair --cleanup
-                rm -rf $tempdir
-  AdiChecker.Leap.15.6:
-    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:Leap:15.6: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:Leap:15.6
-  SBot.Regular.Leap.15.6:
-    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:Leap:15.6 rebuild
-                osc -A https://api.opensuse.org staging -p openSUSE:Leap:15.6 list --supersede
-                osc -A https://api.opensuse.org staging -p openSUSE:Leap:15.6 adi
-                osc -A https://api.opensuse.org staging -p openSUSE:Leap:15.6 unselect --cleanup
-                osc -A https://api.opensuse.org staging -p openSUSE:Leap:15.6 repair --cleanup
+                osc -A https://api.opensuse.org staging -p openSUSE:Backports:SLE-15-SP7 rebuild
+                osc -A https://api.opensuse.org staging -p openSUSE:Backports:SLE-15-SP7 list --supersede
+                osc -A https://api.opensuse.org staging -p openSUSE:Backports:SLE-15-SP7 adi
+                osc -A https://api.opensuse.org staging -p openSUSE:Backports:SLE-15-SP7 unselect --cleanup
+                osc -A https://api.opensuse.org staging -p openSUSE:Backports:SLE-15-SP7 repair --cleanup
                 rm -rf $tempdir
diff --git a/gocd/staging.bot.gocd.yaml.erb b/gocd/staging.bot.gocd.yaml.erb
@@ -1,6 +1,6 @@
 format_version: 3
 pipelines:
-<% %w(Factory Factory:NonFree Backports:SLE-15-SP6 Leap:15.6).each do |project| -%>
+<% %w(Factory Factory:NonFree Backports:SLE-15-SP7).each do |project| -%>
 <% nickname =  project.gsub(':', '.') -%>
   AdiChecker.<%= nickname %>:
     group: openSUSE.Checkers