From 24592be46886d464180abe0bffbd659620f6bdfd Mon Sep 17 00:00:00 2001 From: Max Lin Date: Wed, 14 Jul 2021 16:35:03 +0800 Subject: [PATCH 1/2] gocd: update rbeuild-trigger for Backports and Step --- gocd/rebuild-trigger.gocd.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gocd/rebuild-trigger.gocd.yaml b/gocd/rebuild-trigger.gocd.yaml index cb3ddaeb..62178fd6 100644 --- a/gocd/rebuild-trigger.gocd.yaml +++ b/gocd/rebuild-trigger.gocd.yaml @@ -123,7 +123,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_SP3_Backports: + Trigger.Rebuild.SLE_15_SP4_Backports: group: openSUSE.Checkers lock_behavior: unlockWhenFinished environment_variables: @@ -141,10 +141,10 @@ pipelines: - repo-checker tasks: - script: |- - echo "SLE15 SP3 Backports" - ./project-installcheck.py --debug check --store openSUSE:Backports:SLE-15-SP3:Staging/dashboard --no-rebuild openSUSE:Backports:SLE-15-SP3 - echo "SLE15 SP3 Step Backports (Rebuilds)" - ./project-installcheck.py --debug check --store home:repo-checker/rebuilds -r step openSUSE:Backports:SLE-15-SP3 + echo "SLE15 SP4 Backports" + ./project-installcheck.py --debug check --store openSUSE:Backports:SLE-15-SP4:Staging/dashboard --no-rebuild openSUSE:Backports:SLE-15-SP4 + echo "SLE15 SP4 Step Backports (Rebuilds)" + ./project-installcheck.py --debug check --store home:repo-checker/rebuilds -r step openSUSE:Backports:SLE-15-SP4 Trigger.Rebuild.Step: group: openSUSE.Checkers lock_behavior: unlockWhenFinished @@ -163,6 +163,9 @@ pipelines: - repo-checker tasks: - script: |- + echo "Step 15-SP4" + ./project-installcheck.py --debug check --store home:repo-checker/rebuilds -r standard openSUSE:Step:15-SP4:Update + ./project-installcheck.py --debug check --store home:repo-checker/rebuilds -r standard openSUSE:Step:15-SP4 echo "Step 15-SP3" ./project-installcheck.py --debug check --store home:repo-checker/rebuilds -r standard openSUSE:Step:15-SP3:Update ./project-installcheck.py --debug check --store home:repo-checker/rebuilds -r standard openSUSE:Step:15-SP3 From 03ed62a1467c55e284bcd52a9eda8297a7112e03 Mon Sep 17 00:00:00 2001 From: Max Lin Date: Wed, 14 Jul 2021 16:38:28 +0800 Subject: [PATCH 2/2] gocd: update staging bot for Backports --- gocd/staging.bot.gocd.yaml | 18 +++++++++--------- gocd/staging.bot.gocd.yaml.erb | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gocd/staging.bot.gocd.yaml b/gocd/staging.bot.gocd.yaml index 5b052698..3316cb3c 100644 --- a/gocd/staging.bot.gocd.yaml +++ b/gocd/staging.bot.gocd.yaml @@ -57,7 +57,7 @@ pipelines: osc -A https://api.opensuse.org staging -p openSUSE:Factory unselect --cleanup osc -A https://api.opensuse.org staging -p openSUSE:Factory repair --cleanup rm -rf $tempdir - AdiChecker.Backports.SLE-15-SP3: + AdiChecker.Backports.SLE-15-SP4: group: openSUSE.Checkers lock_behavior: unlockWhenFinished environment_variables: @@ -70,7 +70,7 @@ pipelines: git: git://botmaster.suse.de/opensuse-repos.git auto_update: true whitelist: - - openSUSE:Backports:SLE-15-SP3:Staging:adi*.yaml + - openSUSE:Backports:SLE-15-SP4:Staging:adi*.yaml destination: repos stages: - Run: @@ -80,9 +80,9 @@ pipelines: - repo-checker tasks: - script: |- - ./scripts/staging-installcheck.py -A https://api.opensuse.org -p openSUSE:Backports:SLE-15-SP3 - SBot.Regular.Backports.SLE-15-SP3: - group: Backports.SLE-15-SP3.pkglistgen + ./scripts/staging-installcheck.py -A https://api.opensuse.org -p openSUSE:Backports:SLE-15-SP4 + SBot.Regular.Backports.SLE-15-SP4: + group: Backports.SLE-15-SP4.pkglistgen lock_behavior: unlockWhenFinished timer: spec: 0 0 * ? * * @@ -109,8 +109,8 @@ pipelines: ln -s $PWD/osclib $tempdir/.osc-plugins export HOME=$tempdir - osc -A https://api.opensuse.org staging -p openSUSE:Backports:SLE-15-SP3 list --supersede - osc -A https://api.opensuse.org staging -p openSUSE:Backports:SLE-15-SP3 adi --by-develproject - osc -A https://api.opensuse.org staging -p openSUSE:Backports:SLE-15-SP3 unselect --cleanup - osc -A https://api.opensuse.org staging -p openSUSE:Backports:SLE-15-SP3 repair --cleanup + osc -A https://api.opensuse.org staging -p openSUSE:Backports:SLE-15-SP4 list --supersede + osc -A https://api.opensuse.org staging -p openSUSE:Backports:SLE-15-SP4 adi --by-develproject + osc -A https://api.opensuse.org staging -p openSUSE:Backports:SLE-15-SP4 unselect --cleanup + osc -A https://api.opensuse.org staging -p openSUSE:Backports:SLE-15-SP4 repair --cleanup rm -rf $tempdir diff --git a/gocd/staging.bot.gocd.yaml.erb b/gocd/staging.bot.gocd.yaml.erb index 80a76d4d..8db1a976 100644 --- a/gocd/staging.bot.gocd.yaml.erb +++ b/gocd/staging.bot.gocd.yaml.erb @@ -1,6 +1,6 @@ format_version: 3 pipelines: -<% %w(Factory Backports:SLE-15-SP3).each do |project| -%> +<% %w(Factory Backports:SLE-15-SP4).each do |project| -%> <% nickname = project.gsub(':', '.') -%> AdiChecker.<%= nickname %>: group: openSUSE.Checkers