diff --git a/gocd/pkglistgen.opensuse.gocd.yaml b/gocd/pkglistgen.opensuse.gocd.yaml index 71469469..d9a125e4 100644 --- a/gocd/pkglistgen.opensuse.gocd.yaml +++ b/gocd/pkglistgen.opensuse.gocd.yaml @@ -101,7 +101,7 @@ pipelines: - repo-checker tasks: - script: python3 -u ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Factory:RISCV - Pkglistgen.openSUSE_Leap_15.4: + Pkglistgen.openSUSE_Leap_15.5: group: Leap lock_behavior: unlockWhenFinished environment_variables: @@ -117,12 +117,12 @@ pipelines: approval: type: manual jobs: - openSUSE_Leap_15.4_target: + openSUSE_Leap_15.5_target: resources: - repo-checker tasks: - - script: python3 ./skippkg-finder.py -A https://api.opensuse.org -o openSUSE:Leap:15.4 -s SUSE:SLE-15-SP4:GA - - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.4 -s target + - 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 Pkglistgen.openSUSE_Leap_15.3_Update_Respin: group: Leap lock_behavior: unlockWhenFinished @@ -146,7 +146,7 @@ pipelines: - script: python3 ./skippkg-finder.py -A https://api.opensuse.org -o openSUSE:Leap:15.3:Update:Respin -t openSUSE:Leap:15.3:Update -s SUSE:SLE-15-SP3:Update - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.3:Update:Respin -s target - Update.Repos.Leap.openSUSE_Leap_15.4: + Update.Repos.Leap.openSUSE_Leap_15.5: group: Leap lock_behavior: unlockWhenFinished environment_variables: @@ -162,11 +162,11 @@ pipelines: approval: type: manual jobs: - openSUSE_Leap_15.4: + openSUSE_Leap_15.5: resources: - repo-checker tasks: - - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Leap:15.4 + - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Leap:15.5 Update.Repos.Leap.openSUSE_Leap_15.3_Update_Respin: group: Leap lock_behavior: unlockWhenFinished diff --git a/gocd/pkglistgen.opensuse.gocd.yaml.erb b/gocd/pkglistgen.opensuse.gocd.yaml.erb index c8f2abff..d2072b5d 100644 --- a/gocd/pkglistgen.opensuse.gocd.yaml.erb +++ b/gocd/pkglistgen.opensuse.gocd.yaml.erb @@ -57,7 +57,7 @@ pipelines: tasks: - script: python3 -u ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos <%= project %> <% end -%> - Pkglistgen.openSUSE_Leap_15.4: + Pkglistgen.openSUSE_Leap_15.5: group: Leap lock_behavior: unlockWhenFinished environment_variables: @@ -73,7 +73,7 @@ pipelines: approval: type: manual jobs: -<% ['openSUSE:Leap:15.4/target'].each do |project| +<% ['openSUSE:Leap:15.5/target'].each do |project| project=project.split('/') name=project[0].gsub(':', '_') if project.size > 1 @@ -85,7 +85,7 @@ pipelines: resources: - repo-checker tasks: - - script: python3 ./skippkg-finder.py -A https://api.opensuse.org -o openSUSE:Leap:15.4 -s SUSE:SLE-15-SP4:GA + - 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 <%= project[0] %><%= options %> <% end -%> Pkglistgen.openSUSE_Leap_15.3_Update_Respin: @@ -120,7 +120,7 @@ pipelines: - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p <%= project[0] %><%= options %> <% end -%> -<% %w(openSUSE:Leap:15.4 openSUSE:Leap:15.3:Update:Respin).each do |project| -%> +<% %w(openSUSE:Leap:15.5 openSUSE:Leap:15.3:Update:Respin).each do |project| -%> Update.Repos.Leap.<%= project.gsub(':', '_') %>: group: Leap lock_behavior: unlockWhenFinished diff --git a/gocd/rebuild-trigger.gocd.yaml b/gocd/rebuild-trigger.gocd.yaml index 15d180a5..287369c7 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_SP4_Backports: + Trigger.Rebuild.SLE_15_SP5_Backports: group: openSUSE.Checkers lock_behavior: unlockWhenFinished environment_variables: @@ -141,10 +141,10 @@ pipelines: - repo-checker tasks: - script: |- - 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 + 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 Trigger.Rebuild.Step: group: openSUSE.Checkers lock_behavior: unlockWhenFinished diff --git a/gocd/staging.bot.gocd.yaml b/gocd/staging.bot.gocd.yaml index e98f4179..3f6e84a8 100644 --- a/gocd/staging.bot.gocd.yaml +++ b/gocd/staging.bot.gocd.yaml @@ -56,7 +56,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-SP4: + AdiChecker.Backports.SLE-15-SP5: group: openSUSE.Checkers lock_behavior: unlockWhenFinished environment_variables: @@ -69,7 +69,7 @@ pipelines: git: git://botmaster.suse.de/opensuse-repos.git auto_update: true whitelist: - - openSUSE:Backports:SLE-15-SP4:Staging:adi*.yaml + - openSUSE:Backports:SLE-15-SP5:Staging:adi*.yaml destination: repos stages: - Run: @@ -79,8 +79,8 @@ pipelines: - repo-checker tasks: - script: |- - ./scripts/staging-installcheck.py -A https://api.opensuse.org -p openSUSE:Backports:SLE-15-SP4 - SBot.Regular.Backports.SLE-15-SP4: + ./scripts/staging-installcheck.py -A https://api.opensuse.org -p openSUSE:Backports:SLE-15-SP5 + SBot.Regular.Backports.SLE-15-SP5: group: openSUSE.Checkers lock_behavior: unlockWhenFinished timer: @@ -107,8 +107,64 @@ pipelines: ln -s $PWD/osclib $tempdir/.osc-plugins export HOME=$tempdir - 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 - 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 + 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 + rm -rf $tempdir + AdiChecker.Leap.15.5: + 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:15.5: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:15.5 + SBot.Regular.Leap.15.5: + 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: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 rm -rf $tempdir diff --git a/gocd/staging.bot.gocd.yaml.erb b/gocd/staging.bot.gocd.yaml.erb index 1d124f3f..13163619 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-SP4).each do |project| -%> +<% %w(Factory Backports:SLE-15-SP5 Leap:15.5).each do |project| -%> <% nickname = project.gsub(':', '.') -%> AdiChecker.<%= nickname %>: group: openSUSE.Checkers