diff --git a/gocd/pkglistgen.opensuse.gocd.yaml b/gocd/pkglistgen.opensuse.gocd.yaml index ef4f5463..5410410e 100644 --- a/gocd/pkglistgen.opensuse.gocd.yaml +++ b/gocd/pkglistgen.opensuse.gocd.yaml @@ -130,28 +130,6 @@ pipelines: tasks: - 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 - environment_variables: - OSC_CONFIG: /home/go/config/oscrc-staging-bot - timer: - spec: 0 40 * ? * * - only_on_changes: false - materials: - git: - git: https://github.com/openSUSE/openSUSE-release-tools.git - stages: - - pkglistgen: - approval: - type: manual - jobs: - openSUSE_Leap_15.3_Update_Respin_target: - resources: - - repo-checker - tasks: - - 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 Pkglistgen.openSUSE_Leap_15.4_CR: group: Leap lock_behavior: unlockWhenFinished @@ -216,24 +194,3 @@ pipelines: - repo-checker tasks: - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Leap:15.4:Images - Update.Repos.Leap.openSUSE_Leap_15.3_Update_Respin: - group: Leap - lock_behavior: unlockWhenFinished - environment_variables: - OSC_CONFIG: /home/go/config/oscrc-staging-bot - timer: - spec: 0 0 0 */3 * ? - only_on_changes: false - materials: - git: - git: https://github.com/openSUSE/openSUSE-release-tools.git - stages: - - Update: - approval: - type: manual - jobs: - openSUSE_Leap_15.3_Update_Respin: - resources: - - repo-checker - tasks: - - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Leap:15.3:Update:Respin diff --git a/gocd/pkglistgen.opensuse.gocd.yaml.erb b/gocd/pkglistgen.opensuse.gocd.yaml.erb index d0b3b4b3..a8107de7 100644 --- a/gocd/pkglistgen.opensuse.gocd.yaml.erb +++ b/gocd/pkglistgen.opensuse.gocd.yaml.erb @@ -87,37 +87,6 @@ pipelines: tasks: - 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: - group: Leap - lock_behavior: unlockWhenFinished - environment_variables: - OSC_CONFIG: /home/go/config/oscrc-staging-bot - timer: - spec: 0 40 * ? * * - only_on_changes: false - materials: - git: - git: https://github.com/openSUSE/openSUSE-release-tools.git - stages: - - pkglistgen: - approval: - type: manual - jobs: -<% ['openSUSE:Leap:15.3:Update:Respin/target'].each do |project| - project=project.split('/') - name=project[0].gsub(':', '_') - if project.size > 1 - options=" -s #{project[1]}" - name = name + "_#{project[1]}" - end - -%> - <%= name %>: - resources: - - repo-checker - tasks: - - 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 <%= project[0] %><%= options %> <% end -%> Pkglistgen.openSUSE_Leap_15.4_CR: group: Leap @@ -150,7 +119,7 @@ pipelines: - script: python3 ./skippkg-finder.py -A https://api.opensuse.org -o openSUSE:Leap:15.4:Images -t openSUSE:Leap:15.4:Update -s SUSE:SLE-15-SP4:Update - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p <%= project[0] %><%= options %> <% end -%> -<% %w(openSUSE:Leap:15.5 openSUSE:Leap:15.4:Images openSUSE:Leap:15.3:Update:Respin).each do |project| -%> +<% %w(openSUSE:Leap:15.5 openSUSE:Leap:15.4:Images).each do |project| -%> Update.Repos.Leap.<%= project.gsub(':', '_') %>: group: Leap lock_behavior: unlockWhenFinished diff --git a/gocd/totestmanager.gocd.yaml b/gocd/totestmanager.gocd.yaml index 85c94cbd..418bb68b 100644 --- a/gocd/totestmanager.gocd.yaml +++ b/gocd/totestmanager.gocd.yaml @@ -105,111 +105,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:Factory:zSystems - TTM.Leap_15.3_ARM: - 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.3:ARM - TTM.Leap_15.3_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.3:ARM:Images - TTM.Leap_15.3_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.3:Images - TTM.Leap_15.3_WSL: - 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.3:WSL - TTM.Leap_15.3_Update_Respin: - 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.3:Update:Respin TTM.Leap_15.4_Images: group: openSUSE.Checkers lock_behavior: unlockWhenFinished diff --git a/gocd/totestmanager.gocd.yaml.erb b/gocd/totestmanager.gocd.yaml.erb index 6d412fda..754a0fc9 100644 --- a/gocd/totestmanager.gocd.yaml.erb +++ b/gocd/totestmanager.gocd.yaml.erb @@ -6,11 +6,6 @@ pipelines: openSUSE:Factory:LegacyX86 openSUSE:Factory:PowerPC openSUSE:Factory:zSystems - openSUSE:Leap:15.3:ARM - openSUSE:Leap:15.3:ARM:Images - openSUSE:Leap:15.3:Images - openSUSE:Leap:15.3:WSL - openSUSE:Leap:15.3:Update:Respin openSUSE:Leap:15.4:Images openSUSE:Leap:15.4:ARM openSUSE:Leap:15.4:ARM:Images diff --git a/gocd/vagrant-publisher.gocd.yaml b/gocd/vagrant-publisher.gocd.yaml index 17746c20..d4b0faf8 100644 --- a/gocd/vagrant-publisher.gocd.yaml +++ b/gocd/vagrant-publisher.gocd.yaml @@ -51,18 +51,6 @@ pipelines: tasks: - script: | ruby obs-to-vagrantcloud.rb --url https://download.opensuse.org/ports/aarch64/tumbleweed/appliances/boxes/openSUSE-MicroOS.aarch64-ContainerHost-Vagrant.json --organization opensuse --new-box-name MicroOS-ContainerHost.aarch64 - publish_Leap-15_3_x86_64: - resources: - - staging-bot - tasks: - - script: | - ruby obs-to-vagrantcloud.rb --url https://download.opensuse.org/distribution/leap/15.3/appliances/boxes/Leap-15.3.x86_64.json --organization opensuse --new-box-name Leap-15.3.x86_64 - publish_Leap-15_3_aarch64: - resources: - - staging-bot - tasks: - - script: | - ruby obs-to-vagrantcloud.rb --url https://download.opensuse.org/distribution/leap/15.3/appliances/boxes/Leap-15.3.aarch64-libvirt_aarch64.json --organization opensuse --new-box-name Leap-15.3.aarch64 publish_Leap-15_4_x86_64: resources: - staging-bot diff --git a/gocd/vagrant-publisher.gocd.yaml.erb b/gocd/vagrant-publisher.gocd.yaml.erb index 55c5adbb..cf83e5f1 100644 --- a/gocd/vagrant-publisher.gocd.yaml.erb +++ b/gocd/vagrant-publisher.gocd.yaml.erb @@ -21,8 +21,6 @@ pipelines: ['https://download.opensuse.org/tumbleweed/appliances/boxes/openSUSE-MicroOS.x86_64-ContainerHost-Vagrant.json', 'MicroOS-ContainerHost.x86_64'], ['https://download.opensuse.org/ports/aarch64/tumbleweed/appliances/boxes/openSUSE-MicroOS.aarch64-Vagrant.json', 'MicroOS.aarch64'], ['https://download.opensuse.org/ports/aarch64/tumbleweed/appliances/boxes/openSUSE-MicroOS.aarch64-ContainerHost-Vagrant.json', 'MicroOS-ContainerHost.aarch64'], -['https://download.opensuse.org/distribution/leap/15.3/appliances/boxes/Leap-15.3.x86_64.json', 'Leap-15.3.x86_64'], -['https://download.opensuse.org/distribution/leap/15.3/appliances/boxes/Leap-15.3.aarch64-libvirt_aarch64.json', 'Leap-15.3.aarch64'], ['https://download.opensuse.org/distribution/leap/15.4/appliances/boxes/Leap-15.4.x86_64.json', 'Leap-15.4.x86_64'], ['https://download.opensuse.org/distribution/leap/15.4/appliances/boxes/Leap-15.4.aarch64-libvirt_aarch64.json', 'Leap-15.4.aarch64'], ].each do |url, box_name| %>