Merge pull request #2060 from coolo/more_python3

Gocd config changes for sp5 and repo checker
2019-05-27 16:18:48 +02:00 · 2019-05-27 16:18:48 +02:00 · 7f657d82d8
commit 7f657d82d8
parent dd3275567b 599f820a3d
4 changed files with 220 additions and 79 deletions
--- a/gocd/checkers.suse.gocd.yaml
+++ b/gocd/checkers.suse.gocd.yaml
@ -197,67 +197,204 @@ pipelines:
            - staging-bot3
            tasks:
            - script: ./check_source.py -A https://api.suse.de --verbose --skip-add-reviews --group factory-auto review
-  SLE12.SP5.InstallCheck:
+  SLE12.SP5.InstallCheck.A:
    group: SLE.Checkers
    lock_behavior: unlockWhenFinished
-    timer:
-      spec: 0 */20 * ? * *
    environment_variables:
      OSC_CONFIG: /home/go/config/oscrc-repo-checker
    materials:
-      git:
+      scripts:
        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        destination: scripts
+        whitelist:
+          - DO_NOT_TRIGGER
+      stagings:
+        git: git://botmaster.suse.de/suse-repos.git
+        destination: repos
+        whitelist:
+          - SUSE:SLE-12-SP5:GA:Staging:A_-_standard.yaml
    stages:
    - Run:
-        approval:
-          type: manual
-        jobs:
-          Run.A:
-            timeout: 0
-            resources:
-            - repo-checker3
-            tasks:
-            - script: ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s A
-          Run.B:
-            timeout: 0
-            resources:
-            - repo-checker3
-            tasks:
-            - script: ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s B
-          Run.C:
-            timeout: 0
-            resources:
-            - repo-checker3
-            tasks:
-            - script: ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s C
-          Run.D:
-            timeout: 0
-            resources:
-            - repo-checker3
-            tasks:
-            - script: ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s D
-          Run.H:
-            timeout: 0
-            resources:
-            - repo-checker3
-            tasks:
-            - script: ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s H
-          Run.S:
-            timeout: 0
-            resources:
-            - repo-checker3
-            tasks:
-            - script: ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s S
-          Run.V:
-            timeout: 0
-            resources:
-            - repo-checker3
-            tasks:
-            - script: ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s V
-          Run.Y:
-            timeout: 0
-            resources:
-            - repo-checker3
-            tasks:
-            - script: ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s Y
+        timeout: 0
+        resources:
+        - repo-checker3
+        tasks:
+        - script: |-
+           cd scripts
+           ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s A
+  SLE12.SP5.InstallCheck.B:
+    group: SLE.Checkers
+    lock_behavior: unlockWhenFinished
+    environment_variables:
+      OSC_CONFIG: /home/go/config/oscrc-repo-checker
+    materials:
+      scripts:
+        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        destination: scripts
+        whitelist:
+          - DO_NOT_TRIGGER
+      stagings:
+        git: git://botmaster.suse.de/suse-repos.git
+        destination: repos
+        whitelist:
+          - SUSE:SLE-12-SP5:GA:Staging:B_-_standard.yaml
+    stages:
+    - Run:
+        timeout: 0
+        resources:
+        - repo-checker3
+        tasks:
+        - script: |-
+           cd scripts
+           ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s B
+  SLE12.SP5.InstallCheck.C:
+    group: SLE.Checkers
+    lock_behavior: unlockWhenFinished
+    environment_variables:
+      OSC_CONFIG: /home/go/config/oscrc-repo-checker
+    materials:
+      scripts:
+        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        destination: scripts
+        whitelist:
+          - DO_NOT_TRIGGER
+      stagings:
+        git: git://botmaster.suse.de/suse-repos.git
+        destination: repos
+        whitelist:
+          - SUSE:SLE-12-SP5:GA:Staging:C_-_standard.yaml
+    stages:
+    - Run:
+        timeout: 0
+        resources:
+        - repo-checker3
+        tasks:
+        - script: |-
+           cd scripts
+           ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s C
+  SLE12.SP5.InstallCheck.D:
+    group: SLE.Checkers
+    lock_behavior: unlockWhenFinished
+    environment_variables:
+      OSC_CONFIG: /home/go/config/oscrc-repo-checker
+    materials:
+      scripts:
+        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        destination: scripts
+        whitelist:
+          - DO_NOT_TRIGGER
+      stagings:
+        git: git://botmaster.suse.de/suse-repos.git
+        destination: repos
+        whitelist:
+          - SUSE:SLE-12-SP5:GA:Staging:D_-_standard.yaml
+    stages:
+    - Run:
+        timeout: 0
+        resources:
+        - repo-checker3
+        tasks:
+        - script: |-
+           cd scripts
+           ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s D
+  SLE12.SP5.InstallCheck.H:
+    group: SLE.Checkers
+    lock_behavior: unlockWhenFinished
+    environment_variables:
+      OSC_CONFIG: /home/go/config/oscrc-repo-checker
+    materials:
+      scripts:
+        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        destination: scripts
+        whitelist:
+          - DO_NOT_TRIGGER
+      stagings:
+        git: git://botmaster.suse.de/suse-repos.git
+        destination: repos
+        whitelist:
+          - SUSE:SLE-12-SP5:GA:Staging:H_-_standard.yaml
+    stages:
+    - Run:
+        timeout: 0
+        resources:
+        - repo-checker3
+        tasks:
+        - script: |-
+           cd scripts
+           ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s H
+  SLE12.SP5.InstallCheck.S:
+    group: SLE.Checkers
+    lock_behavior: unlockWhenFinished
+    environment_variables:
+      OSC_CONFIG: /home/go/config/oscrc-repo-checker
+    materials:
+      scripts:
+        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        destination: scripts
+        whitelist:
+          - DO_NOT_TRIGGER
+      stagings:
+        git: git://botmaster.suse.de/suse-repos.git
+        destination: repos
+        whitelist:
+          - SUSE:SLE-12-SP5:GA:Staging:S_-_standard.yaml
+    stages:
+    - Run:
+        timeout: 0
+        resources:
+        - repo-checker3
+        tasks:
+        - script: |-
+           cd scripts
+           ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s S
+  SLE12.SP5.InstallCheck.V:
+    group: SLE.Checkers
+    lock_behavior: unlockWhenFinished
+    environment_variables:
+      OSC_CONFIG: /home/go/config/oscrc-repo-checker
+    materials:
+      scripts:
+        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        destination: scripts
+        whitelist:
+          - DO_NOT_TRIGGER
+      stagings:
+        git: git://botmaster.suse.de/suse-repos.git
+        destination: repos
+        whitelist:
+          - SUSE:SLE-12-SP5:GA:Staging:V_-_standard.yaml
+    stages:
+    - Run:
+        timeout: 0
+        resources:
+        - repo-checker3
+        tasks:
+        - script: |-
+           cd scripts
+           ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s V
+  SLE12.SP5.InstallCheck.Y:
+    group: SLE.Checkers
+    lock_behavior: unlockWhenFinished
+    environment_variables:
+      OSC_CONFIG: /home/go/config/oscrc-repo-checker
+    materials:
+      scripts:
+        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        destination: scripts
+        whitelist:
+          - DO_NOT_TRIGGER
+      stagings:
+        git: git://botmaster.suse.de/suse-repos.git
+        destination: repos
+        whitelist:
+          - SUSE:SLE-12-SP5:GA:Staging:Y_-_standard.yaml
+    stages:
+    - Run:
+        timeout: 0
+        resources:
+        - repo-checker3
+        tasks:
+        - script: |-
+           cd scripts
+           ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s Y

--- a/gocd/checkers.suse.gocd.yaml.erb
+++ b/gocd/checkers.suse.gocd.yaml.erb
@ -197,26 +197,30 @@ pipelines:
            - staging-bot3
            tasks:
            - script: ./check_source.py -A https://api.suse.de --verbose --skip-add-reviews --group factory-auto review
-  SLE12.SP5.InstallCheck:
+<% %w(A B C D H S V Y).each do |letter| -%>
+  SLE12.SP5.InstallCheck.<%= letter %>:
    group: SLE.Checkers
    lock_behavior: unlockWhenFinished
-    timer:
-      spec: 0 */20 * ? * *
    environment_variables:
      OSC_CONFIG: /home/go/config/oscrc-repo-checker
    materials:
-      git:
+      scripts:
        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        destination: scripts
+        whitelist:
+          - DO_NOT_TRIGGER
+      stagings:
+        git: git://botmaster.suse.de/suse-repos.git
+        destination: repos
+        whitelist:
+          - SUSE:SLE-12-SP5:GA:Staging:<%= letter %>_-_standard.yaml
    stages:
    - Run:
-        approval:
-          type: manual
-        jobs:
-<% %w(A B C D H S V Y).each do |letter| -%>
-          Run.<%= letter %>:
-            timeout: 0
-            resources:
-            - repo-checker3
-            tasks:
-            - script: ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s <%= letter %>
+        timeout: 0
+        resources:
+        - repo-checker3
+        tasks:
+        - script: |-
+           cd scripts
+           ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s <%= letter %>
 <% end %>
--- a/gocd/staging.bot.gocd.yaml
+++ b/gocd/staging.bot.gocd.yaml
@ -119,24 +119,24 @@ pipelines:
          openSUSE.Factory:
            timeout: 0
            resources:
-            - repo-checker
+            - repo-checker3
            tasks:
-            - script: /usr/bin/osrt-repo_checker -A https://api.opensuse.org --debug project_only --post-comments openSUSE:Factory
+            - script: ./repo_checker -A https://api.opensuse.org --debug project_only --post-comments openSUSE:Factory
          openSUSE.Leap.15.0.Update:
            timeout: 0
            resources:
-            - repo-checker
+            - repo-checker3
            tasks:
-            - script: /usr/bin/osrt-repo_checker -A https://api.opensuse.org --debug project_only --post-comments openSUSE:Leap:15.0:Update
+            - script: ./repo_checker -A https://api.opensuse.org --debug project_only --post-comments openSUSE:Leap:15.0:Update
          openSUSE.Leap.42.3.Update:
            timeout: 0
            resources:
-            - repo-checker
+            - repo-checker3
            tasks:
-            - script: /usr/bin/osrt-repo_checker -A https://api.opensuse.org --debug project_only --post-comments openSUSE:Leap:42.3:Update
+            - script: ./repo_checker -A https://api.opensuse.org --debug project_only --post-comments openSUSE:Leap:42.3:Update
          openSUSE.Leap.15.1:
            timeout: 0
            resources:
-            - repo-checker
+            - repo-checker3
            tasks:
-            - script: /usr/bin/osrt-repo_checker -A https://api.opensuse.org --debug project_only --post-comments openSUSE:Leap:15.1
+            - script: ./repo_checker -A https://api.opensuse.org --debug project_only --post-comments openSUSE:Leap:15.1
--- a/gocd/staging.bot.gocd.yaml.erb
+++ b/gocd/staging.bot.gocd.yaml.erb
@ -73,7 +73,7 @@ pipelines:
          <%= project.gsub(':', '.') %>:
            timeout: 0
            resources:
-            - repo-checker
+            - repo-checker3
            tasks:
-            - script: /usr/bin/osrt-repo_checker -A https://api.opensuse.org --debug project_only --post-comments <%= project %>
+            - script: ./repo_checker -A https://api.opensuse.org --debug project_only --post-comments <%= project %>
 <% end -%>