Merge pull request #2994 from nilxam/156_setup

gocd: enable Leap 15.6 checkers
2023-07-21 17:17:47 +02:00 · 2023-07-21 17:17:47 +02:00 · fec8443fc8
commit fec8443fc8
parent 3301485864 5a2e50a758
7 changed files with 126 additions and 60 deletions
--- a/gocd/pkglistgen.opensuse.gocd.yaml
+++ b/gocd/pkglistgen.opensuse.gocd.yaml
@ -129,7 +129,7 @@ pipelines:
            - repo-checker
            tasks:
            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:16.0 -s target
-  Pkglistgen.openSUSE_Leap_15.5:
+  Pkglistgen.openSUSE_Leap_15.6:
    group: Leap
    lock_behavior: unlockWhenFinished
    environment_variables:
@ -145,12 +145,12 @@ pipelines:
        approval:
          type: manual
        jobs:
-          openSUSE_Leap_15.5_target:
+          openSUSE_Leap_15.6_target:
            resources:
            - repo-checker
            tasks:
-            - script: python3 ./skippkg-finder.py -A https://api.opensuse.org -o openSUSE:Leap:15.5 -s SUSE:SLE-15-SP5:GA
-            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.5 -s target
+            - script: python3 ./skippkg-finder.py -A https://api.opensuse.org -o openSUSE:Leap:15.6 -s SUSE:SLE-15-SP6:GA
+            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.6 -s target
  Pkglistgen.openSUSE_Leap_15.4_CR:
    group: Leap
    lock_behavior: unlockWhenFinished
@ -173,7 +173,7 @@ pipelines:
            tasks:
            - script: python3 ./skippkg-finder.py -A https://api.opensuse.org -o openSUSE:Leap:15.4:Images -t openSUSE:Leap:15.4:Update -s SUSE:SLE-15-SP4:Update
            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.4:Images -s target
-  Update.Repos.Leap.openSUSE_Leap_15.5:
+  Update.Repos.Leap.openSUSE_Leap_15.6:
    group: Leap
    lock_behavior: unlockWhenFinished
    environment_variables:
@ -189,11 +189,11 @@ pipelines:
        approval:
          type: manual
        jobs:
-          openSUSE_Leap_15.5:
+          openSUSE_Leap_15.6:
            resources:
            - repo-checker
            tasks:
-              - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Leap:15.5
+              - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Leap:15.6
  Update.Repos.Leap.openSUSE_Leap_15.4_Images:
    group: Leap
    lock_behavior: unlockWhenFinished
--- a/gocd/pkglistgen.opensuse.gocd.yaml.erb
+++ b/gocd/pkglistgen.opensuse.gocd.yaml.erb
@ -87,7 +87,7 @@ pipelines:
            tasks:
            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p <%= project[0] %><%= options %>
 <% end -%>
-  Pkglistgen.openSUSE_Leap_15.5:
+  Pkglistgen.openSUSE_Leap_15.6:
    group: Leap
    lock_behavior: unlockWhenFinished
    environment_variables:
@ -103,7 +103,7 @@ pipelines:
        approval:
          type: manual
        jobs:
-<% ['openSUSE:Leap:15.5/target'].each do |project|
+<% ['openSUSE:Leap:15.6/target'].each do |project|
  project=project.split('/')
  name=project[0].gsub(':', '_')
  if project.size > 1
@ -115,7 +115,7 @@ pipelines:
            resources:
            - repo-checker
            tasks:
-            - script: python3 ./skippkg-finder.py -A https://api.opensuse.org -o openSUSE:Leap:15.5 -s SUSE:SLE-15-SP5:GA
+            - script: python3 ./skippkg-finder.py -A https://api.opensuse.org -o openSUSE:Leap:15.6 -s SUSE:SLE-15-SP6:GA
            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p <%= project[0] %><%= options %>
 <% end -%>
  Pkglistgen.openSUSE_Leap_15.4_CR:
@ -149,7 +149,7 @@ pipelines:
            - script: python3 ./skippkg-finder.py -A https://api.opensuse.org -o openSUSE:Leap:15.4:Images -t openSUSE:Leap:15.4:Update -s SUSE:SLE-15-SP4:Update
            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p <%= project[0] %><%= options %>
 <% end -%>
-<% %w(openSUSE:Leap:15.5 openSUSE:Leap:15.4:Images).each do |project| -%>
+<% %w(openSUSE:Leap:15.6 openSUSE:Leap:15.4:Images).each do |project| -%>
  Update.Repos.Leap.<%= project.gsub(':', '_') %>:
    group: Leap
    lock_behavior: unlockWhenFinished
--- 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_SP5_Backports:
+  Trigger.Rebuild.SLE_15_SP6_Backports:
    group: openSUSE.Checkers
    lock_behavior: unlockWhenFinished
    environment_variables:
@ -161,10 +161,10 @@ pipelines:
          - repo-checker
        tasks:
          - script: |-
-              echo "SLE15 SP5 Backports"
-              ./project-installcheck.py --debug check --store openSUSE:Backports:SLE-15-SP5:Staging/dashboard --no-rebuild openSUSE:Backports:SLE-15-SP5
-              echo "SLE15 SP5 Step Backports (Rebuilds)"
-              ./project-installcheck.py --debug check --store home:repo-checker/rebuilds -r step openSUSE:Backports:SLE-15-SP5
+              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
  Trigger.Rebuild.Step:
    group: openSUSE.Checkers
    lock_behavior: unlockWhenFinished
@ -193,7 +193,7 @@ pipelines:
              ./project-installcheck.py --debug check --store home:repo-checker/rebuilds -r standard openSUSE:Step:15-SP1
              echo "Step 15"
              ./project-installcheck.py --debug check --store home:repo-checker/rebuilds -r standard openSUSE:Step:15
-  Trigger.Rebuild.Leap_15_5:
+  Trigger.Rebuild.Leap_15_6:
    group: openSUSE.Checkers
    lock_behavior: unlockWhenFinished
    environment_variables:
@ -211,5 +211,5 @@ pipelines:
          - repo-checker
        tasks:
          - script: |-
-              echo "Leap 15.5"
-              ./project-installcheck.py --debug check --store openSUSE:Leap:15.5:Staging/dashboard --no-rebuild openSUSE:Leap:15.5
+              echo "Leap 15.6"
+              ./project-installcheck.py --debug check --store openSUSE:Leap:15.6:Staging/dashboard --no-rebuild openSUSE:Leap:15.6
--- 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-SP5:
+  AdiChecker.Backports.SLE-15-SP6:
    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-SP5:Staging:adi*.yaml
+          - openSUSE:Backports:SLE-15-SP6: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-SP5
-  SBot.Regular.Backports.SLE-15-SP5:
+                ./scripts/staging-installcheck.py -A https://api.opensuse.org -p openSUSE:Backports:SLE-15-SP6
+  SBot.Regular.Backports.SLE-15-SP6:
    group: openSUSE.Checkers
    lock_behavior: unlockWhenFinished
    timer:
@ -165,13 +165,13 @@ 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
-                osc -A https://api.opensuse.org staging -p openSUSE:Backports:SLE-15-SP5 repair --cleanup
+                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.5:
+  AdiChecker.Leap.15.6:
    group: openSUSE.Checkers
    lock_behavior: unlockWhenFinished
    environment_variables:
@ -184,7 +184,7 @@ pipelines:
        git: git://botmaster.suse.de/opensuse-repos.git
        auto_update: true
        whitelist:
-          - openSUSE:Leap:15.5:Staging:adi*.yaml
+          - openSUSE:Leap:15.6:Staging:adi*.yaml
        destination: repos
    stages:
    - Run:
@ -194,8 +194,8 @@ pipelines:
            - repo-checker
            tasks:
            - script: |-
-                ./scripts/staging-installcheck.py -A https://api.opensuse.org -p openSUSE:Leap:15.5
-  SBot.Regular.Leap.15.5:
+                ./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:
@ -222,9 +222,9 @@ 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
-                osc -A https://api.opensuse.org staging -p openSUSE:Leap:15.5 repair --cleanup
+                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
                rm -rf $tempdir
--- 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-SP5 Leap:15.5).each do |project| -%>
+<% %w(Factory Factory:NonFree Backports:SLE-15-SP6 Leap:15.6).each do |project| -%>
 <% nickname =  project.gsub(':', '.') -%>
  AdiChecker.<%= nickname %>:
    group: openSUSE.Checkers
--- a/gocd/totestmanager.gocd.yaml
+++ b/gocd/totestmanager.gocd.yaml
@ -168,27 +168,6 @@ pipelines:
        - script: |-
            install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf
            scripts/totest-manager.py -A https://api.opensuse.org --debug run openSUSE:Leap:15.4:ARM:Images
-  TTM.Leap_15.5:
-    group: openSUSE.Checkers
-    lock_behavior: unlockWhenFinished
-    environment_variables:
-      OSC_CONFIG: /home/go/config/oscrc-totest-manager
-    materials:
-      script:
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
-        destination: scripts
-    timer:
-      spec: 0 */15 * ? * *
-      only_on_changes: false
-    stages:
-    - Run:
-        approval: manual
-        resources:
-        - staging-bot
-        tasks:
-        - script: |-
-            install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf
-            scripts/totest-manager.py -A https://api.opensuse.org --debug run openSUSE:Leap:15.5
  TTM.Leap_15.5_Images:
    group: openSUSE.Checkers
    lock_behavior: unlockWhenFinished
@ -252,6 +231,90 @@ pipelines:
        - script: |-
            install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf
            scripts/totest-manager.py -A https://api.opensuse.org --debug run openSUSE:Leap:15.5:ARM:Images
+  TTM.Leap_15.6:
+    group: openSUSE.Checkers
+    lock_behavior: unlockWhenFinished
+    environment_variables:
+      OSC_CONFIG: /home/go/config/oscrc-totest-manager
+    materials:
+      script:
+        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        destination: scripts
+    timer:
+      spec: 0 */15 * ? * *
+      only_on_changes: false
+    stages:
+    - Run:
+        approval: manual
+        resources:
+        - staging-bot
+        tasks:
+        - script: |-
+            install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf
+            scripts/totest-manager.py -A https://api.opensuse.org --debug run openSUSE:Leap:15.6
+  TTM.Leap_15.6_Images:
+    group: openSUSE.Checkers
+    lock_behavior: unlockWhenFinished
+    environment_variables:
+      OSC_CONFIG: /home/go/config/oscrc-totest-manager
+    materials:
+      script:
+        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        destination: scripts
+    timer:
+      spec: 0 */15 * ? * *
+      only_on_changes: false
+    stages:
+    - Run:
+        approval: manual
+        resources:
+        - staging-bot
+        tasks:
+        - script: |-
+            install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf
+            scripts/totest-manager.py -A https://api.opensuse.org --debug run openSUSE:Leap:15.6:Images
+  TTM.Leap_15.6_ARM:
+    group: openSUSE.Checkers
+    lock_behavior: unlockWhenFinished
+    environment_variables:
+      OSC_CONFIG: /home/go/config/oscrc-totest-manager
+    materials:
+      script:
+        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        destination: scripts
+    timer:
+      spec: 0 */15 * ? * *
+      only_on_changes: false
+    stages:
+    - Run:
+        approval: manual
+        resources:
+        - staging-bot
+        tasks:
+        - script: |-
+            install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf
+            scripts/totest-manager.py -A https://api.opensuse.org --debug run openSUSE:Leap:15.6:ARM
+  TTM.Leap_15.6_ARM_Images:
+    group: openSUSE.Checkers
+    lock_behavior: unlockWhenFinished
+    environment_variables:
+      OSC_CONFIG: /home/go/config/oscrc-totest-manager
+    materials:
+      script:
+        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        destination: scripts
+    timer:
+      spec: 0 */15 * ? * *
+      only_on_changes: false
+    stages:
+    - Run:
+        approval: manual
+        resources:
+        - staging-bot
+        tasks:
+        - script: |-
+            install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf
+            scripts/totest-manager.py -A https://api.opensuse.org --debug run openSUSE:Leap:15.6:ARM:Images
  TTM.Leap_Micro_5.4:
    group: openSUSE.Checkers
    lock_behavior: unlockWhenFinished
--- a/gocd/totestmanager.gocd.yaml.erb
+++ b/gocd/totestmanager.gocd.yaml.erb
@ -9,10 +9,13 @@ pipelines:
      openSUSE:Leap:15.4:Images
      openSUSE:Leap:15.4:ARM
      openSUSE:Leap:15.4:ARM:Images
-      openSUSE:Leap:15.5
      openSUSE:Leap:15.5:Images
      openSUSE:Leap:15.5:ARM
      openSUSE:Leap:15.5:ARM:Images
+      openSUSE:Leap:15.6
+      openSUSE:Leap:15.6:Images
+      openSUSE:Leap:15.6:ARM
+      openSUSE:Leap:15.6:ARM:Images
      openSUSE:Leap:Micro:5.4
      openSUSE:Leap:Micro:5.4:Images
  ) -%>