Merge pull request #2136 from coolo/fix_staging_bot

Fix staging bot to run on SP2

gocd/checkers.suse.gocd.yaml

@@ -134,12 +134,12 @@ 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.suse.de staging -p SUSE:SLE-15-SP2:GA rebuild
-               osc -A https://api.opensuse.org staging -p openSUSE:Factory list --supersede
+               osc -A https://api.suse.de staging -p SUSE:SLE-15-SP2:GA list --supersede
-               osc -A https://api.opensuse.org staging -p openSUSE:Factory adi --by-develproject
+               osc -A https://api.suse.de staging -p SUSE:SLE-15-SP2:GA adi --by-develproject
-               osc -A https://api.opensuse.org staging -p openSUSE:Factory select --non-interactive --merge --try-strategies
+               osc -A https://api.suse.de staging -p SUSE:SLE-15-SP2:GA select --non-interactive --merge --try-strategies
-               osc -A https://api.opensuse.org staging -p openSUSE:Factory unselect --cleanup
+               osc -A https://api.suse.de staging -p SUSE:SLE-15-SP2:GA unselect --cleanup
-               osc -A https://api.opensuse.org staging -p openSUSE:Factory repair --cleanup
+               osc -A https://api.suse.de staging -p SUSE:SLE-15-SP2:GA repair --cleanup
                rm -rf $tempdir
   S15.SP2.Staging.Bot.Report:
     group: SLE.Checkers

gocd/checkers.suse.gocd.yaml.erb

@@ -134,12 +134,12 @@ 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.suse.de staging -p SUSE:SLE-15-SP2:GA rebuild
-               osc -A https://api.opensuse.org staging -p openSUSE:Factory list --supersede
+               osc -A https://api.suse.de staging -p SUSE:SLE-15-SP2:GA list --supersede
-               osc -A https://api.opensuse.org staging -p openSUSE:Factory adi --by-develproject
+               osc -A https://api.suse.de staging -p SUSE:SLE-15-SP2:GA adi --by-develproject
-               osc -A https://api.opensuse.org staging -p openSUSE:Factory select --non-interactive --merge --try-strategies
+               osc -A https://api.suse.de staging -p SUSE:SLE-15-SP2:GA select --non-interactive --merge --try-strategies
-               osc -A https://api.opensuse.org staging -p openSUSE:Factory unselect --cleanup
+               osc -A https://api.suse.de staging -p SUSE:SLE-15-SP2:GA unselect --cleanup
-               osc -A https://api.opensuse.org staging -p openSUSE:Factory repair --cleanup
+               osc -A https://api.suse.de staging -p SUSE:SLE-15-SP2:GA repair --cleanup
                rm -rf $tempdir
   S15.SP2.Staging.Bot.Report:
     group: SLE.Checkers

gocd/totestmanager.gocd.yaml

@@ -126,27 +126,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.1:Images
-  TTM.Leap_15.1_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.1:ARM:Images
   TTM.Leap_15.2_Images:
     group: openSUSE.Checkers
     lock_behavior: unlockWhenFinished
@@ -168,6 +147,27 @@ 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.2:Images
+  TTM.Leap_15.1_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.1:ARM:Images
   TTM.Leap_15.2_ARM_Images:
     group: openSUSE.Checkers
     lock_behavior: unlockWhenFinished

gocd/totestmanager.gocd.yaml.erb

@@ -1,8 +1,8 @@
 format_version: 3
 pipelines:
 <% for project in %w(openSUSE:Factory openSUSE:Factory:ARM openSUSE:Factory:PowerPC 
-                       openSUSE:Factory:zSystems openSUSE:Leap:15.0:Images openSUSE:Leap:15.2:Images
+                       openSUSE:Factory:zSystems openSUSE:Leap:15.0:Images openSUSE:Leap:15.1:Images openSUSE:Leap:15.2:Images
-                       openSUSE:Leap:15.2:ARM:Images openSUSE:Leap:15.2 openSUSE:Leap:15.2:ARM openSUSE:Leap:15.2:PowerPC) -%>
+                       openSUSE:Leap:15.1:ARM:Images openSUSE:Leap:15.2:ARM:Images openSUSE:Leap:15.2 openSUSE:Leap:15.2:ARM openSUSE:Leap:15.2:PowerPC) -%>
   TTM.<%= project.gsub('openSUSE:', '').gsub(':', '_') %>:
     group: openSUSE.Checkers
     lock_behavior: unlockWhenFinished