Merge pull request #3142 from nilxam/drop_156

pipeline: remove unneeded pipelines and add needed ones for Leap 16.0
openSUSE · Aug 20, 2024 · 37e5c33 · 37e5c33
2 parents 83685f8 + aa2bc77
commit 37e5c33
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 172 deletions.
diff --git a/gocd/pkglistgen.opensuse.gocd.yaml b/gocd/pkglistgen.opensuse.gocd.yaml
@@ -108,66 +108,3 @@ pipelines:
             - repo-checker
             tasks:
               - script: python3 -u ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Factory:RISCV
-  Pkglistgen.openSUSE_Leap_16.0:
-    group: Leap
-    lock_behavior: unlockWhenFinished
-    environment_variables:
-      OSC_CONFIG: /home/go/config/oscrc-staging-bot
-    timer:
-      spec: 0 40 * ? * *
-      only_on_changes: false
-    materials:
-      git:
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
-    stages:
-    - pkglistgen:
-        approval:
-          type: manual
-        jobs:
-          openSUSE_Leap_16.0_target:
-            resources:
-            - repo-checker
-            tasks:
-            - script: ./pkglistgen.py --verbose -A https://api.opensuse.org update_and_solve --project openSUSE:Leap:16.0 --scope target --engine product_composer --force
-  Pkglistgen.openSUSE_Leap_15.6:
-    group: Leap
-    lock_behavior: unlockWhenFinished
-    environment_variables:
-      OSC_CONFIG: /home/go/config/oscrc-staging-bot
-    timer:
-      spec: 0 40 * ? * *
-      only_on_changes: false
-    materials:
-      git:
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
-    stages:
-    - pkglistgen:
-        approval:
-          type: manual
-        jobs:
-          openSUSE_Leap_15.6_target:
-            resources:
-            - repo-checker
-            tasks:
-            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.6 -s target
-  Update.Repos.Leap.openSUSE_Leap_15.6:
-    group: Leap
-    lock_behavior: unlockWhenFinished
-    environment_variables:
-      OSC_CONFIG: /home/go/config/oscrc-staging-bot
-    timer:
-      spec: 0 0 0 */3 * ?
-      only_on_changes: false
-    materials:
-      git:
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
-    stages:
-    - Update:
-        approval:
-          type: manual
-        jobs:
-          openSUSE_Leap_15.6:
-            resources:
-            - repo-checker
-            tasks:
-              - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Leap:15.6
diff --git a/gocd/pkglistgen.opensuse.gocd.yaml.erb b/gocd/pkglistgen.opensuse.gocd.yaml.erb
@@ -56,87 +56,4 @@ pipelines:
             - repo-checker
             tasks:
               - script: python3 -u ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos <%= project %>
-<% end -%>
-  Pkglistgen.openSUSE_Leap_16.0:
-    group: Leap
-    lock_behavior: unlockWhenFinished
-    environment_variables:
-      OSC_CONFIG: /home/go/config/oscrc-staging-bot
-    timer:
-      spec: 0 40 * ? * *
-      only_on_changes: false
-    materials:
-      git:
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
-    stages:
-    - pkglistgen:
-        approval:
-          type: manual
-        jobs:
-<% ['openSUSE:Leap:16.0/target'].each do |project|
-  project=project.split('/')
-  name=project[0].gsub(':', '_')
-  if project.size > 1
-    options=" -s #{project[1]}"
-    name = name + "_#{project[1]}"
-  end
-  -%>
-          <%= name %>:
-            resources:
-            - repo-checker
-            tasks:
-            - script: ./pkglistgen.py --verbose -A https://api.opensuse.org update_and_solve --project <%= project[0] %> --scope target --engine product_composer --force
-<% end -%>
-  Pkglistgen.openSUSE_Leap_15.6:
-    group: Leap
-    lock_behavior: unlockWhenFinished
-    environment_variables:
-      OSC_CONFIG: /home/go/config/oscrc-staging-bot
-    timer:
-      spec: 0 40 * ? * *
-      only_on_changes: false
-    materials:
-      git:
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
-    stages:
-    - pkglistgen:
-        approval:
-          type: manual
-        jobs:
-<% ['openSUSE:Leap:15.6/target'].each do |project|
-  project=project.split('/')
-  name=project[0].gsub(':', '_')
-  if project.size > 1
-    options=" -s #{project[1]}"
-    name = name + "_#{project[1]}"
-  end
-  -%>
-          <%= name %>:
-            resources:
-            - repo-checker
-            tasks:
-            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p <%= project[0] %><%= options %>
-<% end -%>
-<% %w(openSUSE:Leap:15.6).each do |project| -%>
-  Update.Repos.Leap.<%= project.gsub(':', '_') %>:
-    group: Leap
-    lock_behavior: unlockWhenFinished
-    environment_variables:
-      OSC_CONFIG: /home/go/config/oscrc-staging-bot
-    timer:
-      spec: 0 0 0 */3 * ?
-      only_on_changes: false
-    materials:
-      git:
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
-    stages:
-    - Update:
-        approval:
-          type: manual
-        jobs:
-          <%= project.gsub(':', '_') %>:
-            resources:
-            - repo-checker
-            tasks:
-              - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos <%= project %>
 <% end -%>
diff --git a/gocd/rebuild-trigger.gocd.yaml b/gocd/rebuild-trigger.gocd.yaml
@@ -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_6:
+  Trigger.Rebuild.Leap_16_0:
     group: openSUSE.Checkers
     lock_behavior: unlockWhenFinished
     environment_variables:
@@ -211,5 +211,5 @@ pipelines:
           - repo-checker
         tasks:
           - script: |-
-              echo "Leap 15.6"
-              ./project-installcheck.py --debug check --store openSUSE:Leap:15.6:Staging/dashboard --no-rebuild openSUSE:Leap:15.6
+              echo "Leap 16.0"
+              ./project-installcheck.py --debug check --store openSUSE:Leap:16.0:Staging/dashboard --no-rebuild openSUSE:Leap:16.0
diff --git a/gocd/staging.bot.gocd.yaml b/gocd/staging.bot.gocd.yaml
@@ -114,6 +114,63 @@ 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.Leap.16.0:
+    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:16.0: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:16.0
+  SBot.Regular.Leap.16.0:
+    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:16.0 rebuild
+                osc -A https://api.opensuse.org staging -p openSUSE:Leap:16.0 list --supersede
+                osc -A https://api.opensuse.org staging -p openSUSE:Leap:16.0 adi
+                osc -A https://api.opensuse.org staging -p openSUSE:Leap:16.0 unselect --cleanup
+                osc -A https://api.opensuse.org staging -p openSUSE:Leap:16.0 repair --cleanup
+                rm -rf $tempdir
   AdiChecker.Backports.SLE-15-SP7:
     group: openSUSE.Checkers
     lock_behavior: unlockWhenFinished

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-SP7).each do |project| -%>
+<% %w(Factory Factory:NonFree Leap:16.0 Backports:SLE-15-SP7).each do |project| -%>
 <% nickname =  project.gsub(':', '.') -%>
   AdiChecker.<%= nickname %>:
     group: openSUSE.Checkers

diff --git a/gocd/totestmanager.gocd.yaml b/gocd/totestmanager.gocd.yaml
@@ -189,27 +189,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.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

diff --git a/gocd/totestmanager.gocd.yaml.erb b/gocd/totestmanager.gocd.yaml.erb
@@ -10,7 +10,6 @@ pipelines:
       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