diff --git a/gocd/checkers.suse.gocd.yaml b/gocd/checkers.suse.gocd.yaml index 45e84b9e..286bd572 100644 --- a/gocd/checkers.suse.gocd.yaml +++ b/gocd/checkers.suse.gocd.yaml @@ -60,7 +60,7 @@ pipelines: - repo-checker tasks: - script: ./project-installcheck.py -A https://api.suse.de --debug check --store SUSE:SLE-15-SP4:GA:Staging/dashboard --no-rebuild SUSE:SLE-15-SP4:GA - MicroOS.Project: + SLE-Micro.Project: group: SLE.Checkers lock_behavior: unlockWhenFinished timer: @@ -75,11 +75,11 @@ pipelines: - Run: approval: manual jobs: - MicroOS: + SLE-Micro: resources: - repo-checker tasks: - - script: ./project-installcheck.py -A https://api.suse.de --debug check --store SUSE:SLE-15-SP3:Update:Products:MicroOS52:Staging/dashboard --no-rebuild SUSE:SLE-15-SP3:Update:Products:MicroOS52 + - script: ./project-installcheck.py -A https://api.suse.de --debug check --store SUSE:SLE-15-SP4:Update:Products:Micro53:Staging/dashboard --no-rebuild SUSE:SLE-15-SP4:Update:Products:Micro53 SLE.Origin.Manager: group: SLE.Checkers lock_behavior: unlockWhenFinished @@ -131,7 +131,7 @@ pipelines: osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:GA unselect --cleanup osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:GA repair --cleanup rm -rf $tempdir - MicroOS.Staging.Bot.Regular: + SLE-Micro.Staging.Bot.Regular: group: SLE.Checkers lock_behavior: unlockWhenFinished timer: @@ -158,11 +158,11 @@ pipelines: ln -s $PWD/osclib $tempdir/.osc-plugins export HOME=$tempdir - osc -A https://api.suse.de staging -p SUSE:SLE-15-SP3:Update:Products:MicroOS52 rebuild - osc -A https://api.suse.de staging -p SUSE:SLE-15-SP3:Update:Products:MicroOS52 list --supersede - osc -A https://api.suse.de staging -p SUSE:SLE-15-SP3:Update:Products:MicroOS52 select --non-interactive --merge --try-strategies - osc -A https://api.suse.de staging -p SUSE:SLE-15-SP3:Update:Products:MicroOS52 unselect --cleanup - osc -A https://api.suse.de staging -p SUSE:SLE-15-SP3:Update:Products:MicroOS52 repair --cleanup + osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:Update:Products:Micro53 rebuild + osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:Update:Products:Micro53 list --supersede + osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:Update:Products:Micro53 select --non-interactive --merge --try-strategies + osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:Update:Products:Micro53 unselect --cleanup + osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:Update:Products:Micro53 repair --cleanup rm -rf $tempdir S15.SP4.Staging.Bot.Report: group: SLE.Checkers @@ -184,7 +184,7 @@ pipelines: - staging-bot tasks: - script: ./staging-report.py --debug -A https://api.suse.de -p SUSE:SLE-15-SP4:GA - MicroOS.Staging.Bot.Report: + SLE-Micro.Staging.Bot.Report: group: SLE.Checkers lock_behavior: unlockWhenFinished timer: @@ -203,7 +203,7 @@ pipelines: resources: - staging-bot tasks: - - script: ./staging-report.py --debug -A https://api.suse.de -p SUSE:SLE-15-SP3:Update:Products:MicroOS52 + - script: ./staging-report.py --debug -A https://api.suse.de -p SUSE:SLE-15-SP4:Update:Products:Micro53 SLE.Source.Check: group: SLE.Checkers lock_behavior: unlockWhenFinished diff --git a/gocd/checkers.suse.gocd.yaml.erb b/gocd/checkers.suse.gocd.yaml.erb index 0b6af404..c3adb672 100644 --- a/gocd/checkers.suse.gocd.yaml.erb +++ b/gocd/checkers.suse.gocd.yaml.erb @@ -60,7 +60,7 @@ pipelines: - repo-checker tasks: - script: ./project-installcheck.py -A https://api.suse.de --debug check --store SUSE:SLE-15-SP4:GA:Staging/dashboard --no-rebuild SUSE:SLE-15-SP4:GA - MicroOS.Project: + SLE-Micro.Project: group: SLE.Checkers lock_behavior: unlockWhenFinished timer: @@ -75,11 +75,11 @@ pipelines: - Run: approval: manual jobs: - MicroOS: + SLE-Micro: resources: - repo-checker tasks: - - script: ./project-installcheck.py -A https://api.suse.de --debug check --store SUSE:SLE-15-SP3:Update:Products:MicroOS52:Staging/dashboard --no-rebuild SUSE:SLE-15-SP3:Update:Products:MicroOS52 + - script: ./project-installcheck.py -A https://api.suse.de --debug check --store SUSE:SLE-15-SP4:Update:Products:Micro53:Staging/dashboard --no-rebuild SUSE:SLE-15-SP4:Update:Products:Micro53 SLE.Origin.Manager: group: SLE.Checkers lock_behavior: unlockWhenFinished @@ -131,7 +131,7 @@ pipelines: osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:GA unselect --cleanup osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:GA repair --cleanup rm -rf $tempdir - MicroOS.Staging.Bot.Regular: + SLE-Micro.Staging.Bot.Regular: group: SLE.Checkers lock_behavior: unlockWhenFinished timer: @@ -158,11 +158,11 @@ pipelines: ln -s $PWD/osclib $tempdir/.osc-plugins export HOME=$tempdir - osc -A https://api.suse.de staging -p SUSE:SLE-15-SP3:Update:Products:MicroOS52 rebuild - osc -A https://api.suse.de staging -p SUSE:SLE-15-SP3:Update:Products:MicroOS52 list --supersede - osc -A https://api.suse.de staging -p SUSE:SLE-15-SP3:Update:Products:MicroOS52 select --non-interactive --merge --try-strategies - osc -A https://api.suse.de staging -p SUSE:SLE-15-SP3:Update:Products:MicroOS52 unselect --cleanup - osc -A https://api.suse.de staging -p SUSE:SLE-15-SP3:Update:Products:MicroOS52 repair --cleanup + osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:Update:Products:Micro53 rebuild + osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:Update:Products:Micro53 list --supersede + osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:Update:Products:Micro53 select --non-interactive --merge --try-strategies + osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:Update:Products:Micro53 unselect --cleanup + osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:Update:Products:Micro53 repair --cleanup rm -rf $tempdir S15.SP4.Staging.Bot.Report: group: SLE.Checkers @@ -184,7 +184,7 @@ pipelines: - staging-bot tasks: - script: ./staging-report.py --debug -A https://api.suse.de -p SUSE:SLE-15-SP4:GA - MicroOS.Staging.Bot.Report: + SLE-Micro.Staging.Bot.Report: group: SLE.Checkers lock_behavior: unlockWhenFinished timer: @@ -203,7 +203,7 @@ pipelines: resources: - staging-bot tasks: - - script: ./staging-report.py --debug -A https://api.suse.de -p SUSE:SLE-15-SP3:Update:Products:MicroOS52 + - script: ./staging-report.py --debug -A https://api.suse.de -p SUSE:SLE-15-SP4:Update:Products:Micro53 SLE.Source.Check: group: SLE.Checkers lock_behavior: unlockWhenFinished diff --git a/gocd/microos-stagings.gocd.yaml b/gocd/microos-stagings.gocd.yaml index 64880373..66204c54 100644 --- a/gocd/microos-stagings.gocd.yaml +++ b/gocd/microos-stagings.gocd.yaml @@ -1,7 +1,7 @@ --- format_version: 3 pipelines: - MicroOS.Stagings.RelPkgs: + SLE-Micro.Stagings.RelPkgs: environment_variables: OSC_CONFIG: /home/go/config/oscrc-staging-bot group: MicroOS @@ -16,24 +16,24 @@ pipelines: - Generate.Release.Package: approval: manual jobs: - MicroOS.Staging.A: + SLE-Micro.Staging.A: resources: - repo-checker tasks: - script: ./pkglistgen.py -A https://api.suse.de update_and_solve - --staging SUSE:SLE-15-SP3:Update:Products:MicroOS52:Staging:A + --staging SUSE:SLE-15-SP4:Update:Products:Micro53:Staging:A --only-release-packages --force - MicroOS.Staging.B: + SLE-Micro.Staging.B: resources: - repo-checker tasks: - script: ./pkglistgen.py -A https://api.suse.de update_and_solve - --staging SUSE:SLE-15-SP3:Update:Products:MicroOS52:Staging:B + --staging SUSE:SLE-15-SP4:Update:Products:Micro53:Staging:B --only-release-packages --force - MicroOS.Staging.A: + SLE-Micro.Staging.A: environment_variables: - STAGING_PROJECT: SUSE:SLE-15-SP3:Update:Products:MicroOS52:Staging:A + STAGING_PROJECT: SUSE:SLE-15-SP4:Update:Products:Micro53:Staging:A STAGING_API: https://api.suse.de OSC_CONFIG: /home/go/config/oscrc-staging-bot group: MicroOS @@ -44,7 +44,7 @@ pipelines: auto_update: true destination: repos whitelist: - - SUSE:SLE-15-SP3:Update:Products:MicroOS52:Staging:A_-_standard.yaml + - SUSE:SLE-15-SP4:Update:Products:Micro53:Staging:A_-_standard.yaml scripts: auto_update: true git: https://github.com/openSUSE/openSUSE-release-tools.git @@ -70,7 +70,7 @@ pipelines: - repo-checker tasks: - script: |- - ./scripts/staging-installcheck.py -A $STAGING_API -p SUSE:SLE-15-SP3:Update:Products:MicroOS52 -s $STAGING_PROJECT + ./scripts/staging-installcheck.py -A $STAGING_API -p SUSE:SLE-15-SP4:Update:Products:Micro53 -s $STAGING_PROJECT - Update.000product: resources: @@ -94,9 +94,9 @@ pipelines: - script: |- osc -A $STAGING_API api -X POST "/source/$STAGING_PROJECT?cmd=remove_flag&repository=images&flag=build" - MicroOS.Staging.B: + SLE-Micro.Staging.B: environment_variables: - STAGING_PROJECT: SUSE:SLE-15-SP3:Update:Products:MicroOS52:Staging:B + STAGING_PROJECT: SUSE:SLE-15-SP4:Update:Products:Micro53:Staging:B STAGING_API: https://api.suse.de OSC_CONFIG: /home/go/config/oscrc-staging-bot group: MicroOS @@ -107,7 +107,7 @@ pipelines: auto_update: true destination: repos whitelist: - - SUSE:SLE-15-SP3:Update:Products:MicroOS52:Staging:B_-_standard.yaml + - SUSE:SLE-15-SP4:Update:Products:Micro53:Staging:B_-_standard.yaml scripts: auto_update: true git: https://github.com/openSUSE/openSUSE-release-tools.git @@ -133,7 +133,7 @@ pipelines: - repo-checker tasks: - script: |- - ./scripts/staging-installcheck.py -A $STAGING_API -p SUSE:SLE-15-SP3:Update:Products:MicroOS52 -s $STAGING_PROJECT + ./scripts/staging-installcheck.py -A $STAGING_API -p SUSE:SLE-15-SP4:Update:Products:Micro53 -s $STAGING_PROJECT - Update.000product: resources: diff --git a/gocd/microos-stagings.gocd.yaml.erb b/gocd/microos-stagings.gocd.yaml.erb index 9dfc37ba..2843ccfb 100644 --- a/gocd/microos-stagings.gocd.yaml.erb +++ b/gocd/microos-stagings.gocd.yaml.erb @@ -2,7 +2,7 @@ <% stagings = %w(A B) -%> format_version: 3 pipelines: - MicroOS.Stagings.RelPkgs: + SLE-Micro.Stagings.RelPkgs: environment_variables: OSC_CONFIG: /home/go/config/oscrc-staging-bot group: MicroOS @@ -18,18 +18,18 @@ pipelines: approval: manual jobs: <% stagings.each do |letter| -%> - MicroOS.Staging.<%= letter %>: + SLE-Micro.Staging.<%= letter %>: resources: - repo-checker tasks: - script: ./pkglistgen.py -A https://api.suse.de update_and_solve - --staging SUSE:SLE-15-SP3:Update:Products:MicroOS52:Staging:<%= letter %> + --staging SUSE:SLE-15-SP4:Update:Products:Micro53:Staging:<%= letter %> --only-release-packages --force <% end -%> <% stagings.each do |letter| %> - MicroOS.Staging.<%= letter %>: + SLE-Micro.Staging.<%= letter %>: environment_variables: - STAGING_PROJECT: SUSE:SLE-15-SP3:Update:Products:MicroOS52:Staging:<%= letter %> + STAGING_PROJECT: SUSE:SLE-15-SP4:Update:Products:Micro53:Staging:<%= letter %> STAGING_API: https://api.suse.de OSC_CONFIG: /home/go/config/oscrc-staging-bot group: MicroOS @@ -40,7 +40,7 @@ pipelines: auto_update: true destination: repos whitelist: - - SUSE:SLE-15-SP3:Update:Products:MicroOS52:Staging:<%= letter %>_-_standard.yaml + - SUSE:SLE-15-SP4:Update:Products:Micro53:Staging:<%= letter %>_-_standard.yaml scripts: auto_update: true git: https://github.com/openSUSE/openSUSE-release-tools.git @@ -66,7 +66,7 @@ pipelines: - repo-checker tasks: - script: |- - ./scripts/staging-installcheck.py -A $STAGING_API -p SUSE:SLE-15-SP3:Update:Products:MicroOS52 -s $STAGING_PROJECT + ./scripts/staging-installcheck.py -A $STAGING_API -p SUSE:SLE-15-SP4:Update:Products:Micro53 -s $STAGING_PROJECT - Update.000product: resources: diff --git a/gocd/microos.target.gocd.yaml b/gocd/microos.target.gocd.yaml index 254d4222..6f567d0c 100644 --- a/gocd/microos.target.gocd.yaml +++ b/gocd/microos.target.gocd.yaml @@ -1,6 +1,6 @@ format_version: 3 pipelines: - MicroOS.RelPkgs: + SLE-Micro.RelPkgs: group: MicroOS lock_behavior: unlockWhenFinished timer: @@ -17,9 +17,9 @@ pipelines: resources: - repo-checker tasks: - - script: ./pkglistgen.py -A https://api.suse.de update_and_solve -p SUSE:SLE-15-SP3:Update:Products:MicroOS52 -s target --only-release-packages --force + - script: ./pkglistgen.py -A https://api.suse.de update_and_solve -p SUSE:SLE-15-SP4:Update:Products:Micro53 -s target --only-release-packages --force - MicroOS.Package.Lists: + SLE-Micro.Package.Lists: group: MicroOS lock_behavior: unlockWhenFinished materials: @@ -28,7 +28,7 @@ pipelines: auto_update: true destination: repos whitelist: - - SUSE:SLE-15-SP3:Update:Products:MicroOS52_-_standard.yaml + - SUSE:SLE-15-SP4:Update:Products:Micro53_-_standard.yaml scripts: git: https://github.com/openSUSE/openSUSE-release-tools.git auto_update: true @@ -42,9 +42,9 @@ pipelines: resources: - repo-checker tasks: - - script: ./scripts/pkglistgen.py -A https://api.suse.de --debug update_and_solve -p SUSE:SLE-15-SP3:Update:Products:MicroOS52 -s target --force + - script: ./scripts/pkglistgen.py -A https://api.suse.de --debug update_and_solve -p SUSE:SLE-15-SP4:Update:Products:Micro53 -s target --force - MicroOS.Images: + SLE-Micro.Images: group: MicroOS lock_behavior: unlockWhenFinished materials: @@ -52,7 +52,7 @@ pipelines: git: git://botmaster.suse.de/suse-repos.git auto_update: true whitelist: - - SUSE:SLE-15-SP3:Update:Products:MicroOS52_-_images.yaml + - SUSE:SLE-15-SP4:Update:Products:Micro53_-_images.yaml destination: repos scripts: auto_update: true @@ -69,7 +69,7 @@ pipelines: tasks: - script: | export PYTHONPATH=scripts - ./scripts/gocd/verify-repo-built-successful.py -A https://api.suse.de -p SUSE:SLE-15-SP3:Update:Products:MicroOS52 -r images + ./scripts/gocd/verify-repo-built-successful.py -A https://api.suse.de -p SUSE:SLE-15-SP4:Update:Products:Micro53 -r images - Release.Images.To.Test: approval: manual @@ -81,8 +81,8 @@ pipelines: - staging-bot tasks: - script: |- - for product in 000product SUSE-MicroOS; do - osc -A https://api.suse.de release SUSE:SLE-15-SP3:Update:Products:MicroOS52 $product + for product in 000product SLE-Micro; do + osc -A https://api.suse.de release SUSE:SLE-15-SP4:Update:Products:Micro53 $product done - Release.Images.To.Publish: @@ -94,4 +94,4 @@ pipelines: resources: - staging-bot tasks: - - script: osc -A https://api.suse.de release SUSE:SLE-15-SP3:Update:Products:MicroOS52:TEST + - script: osc -A https://api.suse.de release SUSE:SLE-15-SP4:Update:Products:Micro53:TEST