From dcd076bd639cda3ab42c4e6ce050bdd080ea312f Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 12 Feb 2024 10:16:11 +0100 Subject: [PATCH] Remove 15.4 and add 15.6 where missing 15.4 has been EoL for a while. --- dashboard/generate.py | 7 --- docker_publisher.py | 20 ++++---- gocd/pkglistgen.opensuse.gocd.yaml | 43 ------------------ gocd/pkglistgen.opensuse.gocd.yaml.erb | 33 +------------- gocd/totestmanager.gocd.yaml | 63 -------------------------- gocd/totestmanager.gocd.yaml.erb | 3 -- gocd/vagrant-publisher.gocd.yaml | 16 +++---- gocd/vagrant-publisher.gocd.yaml.erb | 4 +- 8 files changed, 21 insertions(+), 168 deletions(-) diff --git a/dashboard/generate.py b/dashboard/generate.py index 8d9189d78..8378a759a 100644 --- a/dashboard/generate.py +++ b/dashboard/generate.py @@ -191,13 +191,6 @@ def openqa_summary(self): openqa_group='openSUSE Leap 15.5 ARMv7', openqa_version='15.5', openqa_groupid=106) fetcher.add('openSUSE:Leap:15.5:ARM:Images', nick='Leap:15.5:ARM:Images', openqa_group='openSUSE Leap 15.5 ARMv7 Images', openqa_version='15.5', openqa_groupid=104) - fetcher.add('openSUSE:Leap:15.4:Images', nick='Leap:15.4:Images', openqa_group='openSUSE Leap 15.4 Images', - openqa_version='15.4', openqa_groupid=89) - fetcher.add('openSUSE:Leap:15.4:ARM', nick='Leap:15.4:ARM', - download_url='https://download.opensuse.org/ports/armv7hl/distribution/leap/15.4/iso', - openqa_group='openSUSE Leap 15.4 ARMv7', openqa_version='15.4', openqa_groupid=92) - fetcher.add('openSUSE:Leap:15.4:ARM:Images', nick='Leap:15.4:ARM:Images', - openqa_group='openSUSE Leap 15.4 ARMv7 Images', openqa_version='15.4', openqa_groupid=91) with app.app_context(): rendered = render_template('dashboard.html', diff --git a/docker_publisher.py b/docker_publisher.py index 3cf6e2084..993120eda 100755 --- a/docker_publisher.py +++ b/docker_publisher.py @@ -377,16 +377,6 @@ def run(): }, 'publisher': DockerImagePublisherRegistry(drc_tw, "latest"), }, - 'leap-15.4': { - 'fetchers': { - 'x86_64': DockerImageFetcherOBS(url="https://build.opensuse.org/public/build/openSUSE:Containers:Leap:15.4/containers/x86_64/opensuse-leap-image:docker", maintenance_release=True), # noqa: E501 - 'aarch64': DockerImageFetcherOBS(url="https://build.opensuse.org/public/build/openSUSE:Containers:Leap:15.4/containers/aarch64/opensuse-leap-image:docker", maintenance_release=True), # noqa: E501 - 'armv7l': DockerImageFetcherOBS(url="https://build.opensuse.org/public/build/openSUSE:Containers:Leap:15.4/containers_armv7/armv7l/opensuse-leap-image:docker", maintenance_release=True), # noqa: E501 - 'ppc64le': DockerImageFetcherOBS(url="https://build.opensuse.org/public/build/openSUSE:Containers:Leap:15.4/containers/ppc64le/opensuse-leap-image:docker", maintenance_release=True), # noqa: E501 - 's390x': DockerImageFetcherOBS(url="https://build.opensuse.org/public/build/openSUSE:Containers:Leap:15.4/containers/s390x/opensuse-leap-image:docker", maintenance_release=True), # noqa: E501 - }, - 'publisher': DockerImagePublisherRegistry(drc_leap, "15.4"), - }, 'leap-15.5': { 'fetchers': { 'x86_64': DockerImageFetcherOBS(url="https://build.opensuse.org/public/build/openSUSE:Containers:Leap:15.5/containers/x86_64/opensuse-leap-image:docker", maintenance_release=True), # noqa: E501 @@ -397,6 +387,16 @@ def run(): }, 'publisher': DockerImagePublisherRegistry(drc_leap, "latest", ["15.5", "15"]), }, + 'leap-15.6': { + 'fetchers': { + 'x86_64': DockerImageFetcherOBS(url="https://build.opensuse.org/public/build/openSUSE:Containers:Leap:15.6/containers/x86_64/opensuse-leap-image:docker", maintenance_release=True), # noqa: E501 + 'aarch64': DockerImageFetcherOBS(url="https://build.opensuse.org/public/build/openSUSE:Containers:Leap:15.6/containers/aarch64/opensuse-leap-image:docker", maintenance_release=True), # noqa: E501 + 'armv7l': DockerImageFetcherOBS(url="https://build.opensuse.org/public/build/openSUSE:Containers:Leap:15.6/containers_armv7/armv7l/opensuse-leap-image:docker", maintenance_release=True), # noqa: E501 + 'ppc64le': DockerImageFetcherOBS(url="https://build.opensuse.org/public/build/openSUSE:Containers:Leap:15.6/containers/ppc64le/opensuse-leap-image:docker", maintenance_release=True), # noqa: E501 + 's390x': DockerImageFetcherOBS(url="https://build.opensuse.org/public/build/openSUSE:Containers:Leap:15.6/containers/s390x/opensuse-leap-image:docker", maintenance_release=True), # noqa: E501 + }, + 'publisher': DockerImagePublisherRegistry(drc_leap, "15.6"), + }, } # Parse args after defining the config - the available distros are included diff --git a/gocd/pkglistgen.opensuse.gocd.yaml b/gocd/pkglistgen.opensuse.gocd.yaml index f1e5ef980..d0332b946 100644 --- a/gocd/pkglistgen.opensuse.gocd.yaml +++ b/gocd/pkglistgen.opensuse.gocd.yaml @@ -151,28 +151,6 @@ pipelines: tasks: - script: python3 ./skippkg-finder.py -A https://api.opensuse.org -o openSUSE:Leap:15.6 -s SUSE:SLE-15-SP6:GA - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.6 -s target - Pkglistgen.openSUSE_Leap_15.4_CR: - 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.4_Images_target: - resources: - - repo-checker - tasks: - - 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 openSUSE:Leap:15.4:Images -s target Update.Repos.Leap.openSUSE_Leap_15.6: group: Leap lock_behavior: unlockWhenFinished @@ -194,24 +172,3 @@ pipelines: - repo-checker tasks: - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Leap:15.6 - Update.Repos.Leap.openSUSE_Leap_15.4_Images: - 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.4_Images: - resources: - - repo-checker - tasks: - - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Leap:15.4:Images diff --git a/gocd/pkglistgen.opensuse.gocd.yaml.erb b/gocd/pkglistgen.opensuse.gocd.yaml.erb index f0119e712..091522ca4 100644 --- a/gocd/pkglistgen.opensuse.gocd.yaml.erb +++ b/gocd/pkglistgen.opensuse.gocd.yaml.erb @@ -118,38 +118,7 @@ pipelines: - script: python3 ./skippkg-finder.py -A https://api.opensuse.org -o openSUSE:Leap:15.6 -s SUSE:SLE-15-SP6:GA - 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 - 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.4:Images/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.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.6 openSUSE:Leap:15.4:Images).each do |project| -%> +<% %w(openSUSE:Leap:15.6).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 201d57fd8..219426525 100644 --- a/gocd/totestmanager.gocd.yaml +++ b/gocd/totestmanager.gocd.yaml @@ -105,69 +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.4_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.4:Images - TTM.Leap_15.4_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.4:ARM - TTM.Leap_15.4_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.4:ARM:Images TTM.Leap_15.5_Images: group: openSUSE.Checkers lock_behavior: unlockWhenFinished diff --git a/gocd/totestmanager.gocd.yaml.erb b/gocd/totestmanager.gocd.yaml.erb index c29226beb..296d00018 100644 --- a/gocd/totestmanager.gocd.yaml.erb +++ b/gocd/totestmanager.gocd.yaml.erb @@ -6,9 +6,6 @@ pipelines: openSUSE:Factory:LegacyX86 openSUSE:Factory:PowerPC openSUSE:Factory:zSystems - openSUSE:Leap:15.4:Images - openSUSE:Leap:15.4:ARM - openSUSE:Leap:15.4:ARM:Images openSUSE:Leap:15.5:Images openSUSE:Leap:15.5:ARM openSUSE:Leap:15.5:ARM:Images diff --git a/gocd/vagrant-publisher.gocd.yaml b/gocd/vagrant-publisher.gocd.yaml index 5faba2168..2b11cea61 100644 --- a/gocd/vagrant-publisher.gocd.yaml +++ b/gocd/vagrant-publisher.gocd.yaml @@ -51,27 +51,27 @@ 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_4_x86_64: + publish_Leap-15_5_x86_64: resources: - staging-bot tasks: - script: | - ruby obs-to-vagrantcloud.rb --url https://download.opensuse.org/distribution/leap/15.4/appliances/boxes/Leap-15.4.x86_64.json --organization opensuse --new-box-name Leap-15.4.x86_64 - publish_Leap-15_4_aarch64: + ruby obs-to-vagrantcloud.rb --url https://download.opensuse.org/distribution/leap/15.5/appliances/boxes/Leap-15.5.x86_64.json --organization opensuse --new-box-name Leap-15.5.x86_64 + publish_Leap-15_5_aarch64: resources: - staging-bot tasks: - script: | - ruby obs-to-vagrantcloud.rb --url https://download.opensuse.org/distribution/leap/15.4/appliances/boxes/Leap-15.4.aarch64-libvirt_aarch64.json --organization opensuse --new-box-name Leap-15.4.aarch64 - publish_Leap-15_5_x86_64: + ruby obs-to-vagrantcloud.rb --url https://download.opensuse.org/distribution/leap/15.5/appliances/boxes/Leap-15.5.aarch64-libvirt_aarch64.json --organization opensuse --new-box-name Leap-15.5.aarch64 + publish_Leap-15_6_x86_64: resources: - staging-bot tasks: - script: | - ruby obs-to-vagrantcloud.rb --url https://download.opensuse.org/distribution/leap/15.5/appliances/boxes/Leap-15.5.x86_64.json --organization opensuse --new-box-name Leap-15.5.x86_64 - publish_Leap-15_5_aarch64: + ruby obs-to-vagrantcloud.rb --url https://download.opensuse.org/distribution/leap/15.6/appliances/boxes/Leap-15.6.x86_64.json --organization opensuse --new-box-name Leap-15.6.x86_64 + publish_Leap-15_6_aarch64: resources: - staging-bot tasks: - script: | - ruby obs-to-vagrantcloud.rb --url https://download.opensuse.org/distribution/leap/15.5/appliances/boxes/Leap-15.5.aarch64-libvirt_aarch64.json --organization opensuse --new-box-name Leap-15.5.aarch64 + ruby obs-to-vagrantcloud.rb --url https://download.opensuse.org/distribution/leap/15.6/appliances/boxes/Leap-15.6.aarch64-libvirt_aarch64.json --organization opensuse --new-box-name Leap-15.6.aarch64 diff --git a/gocd/vagrant-publisher.gocd.yaml.erb b/gocd/vagrant-publisher.gocd.yaml.erb index f25a5ab06..ce971dfef 100644 --- a/gocd/vagrant-publisher.gocd.yaml.erb +++ b/gocd/vagrant-publisher.gocd.yaml.erb @@ -21,10 +21,10 @@ 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.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'], ['https://download.opensuse.org/distribution/leap/15.5/appliances/boxes/Leap-15.5.x86_64.json', 'Leap-15.5.x86_64'], ['https://download.opensuse.org/distribution/leap/15.5/appliances/boxes/Leap-15.5.aarch64-libvirt_aarch64.json', 'Leap-15.5.aarch64'], +['https://download.opensuse.org/distribution/leap/15.6/appliances/boxes/Leap-15.6.x86_64.json', 'Leap-15.6.x86_64'], +['https://download.opensuse.org/distribution/leap/15.6/appliances/boxes/Leap-15.6.aarch64-libvirt_aarch64.json', 'Leap-15.6.aarch64'], ].each do |url, box_name| %> publish_<%= box_name.gsub('.', '_') %>: resources: