diff --git a/config/announcer/openSUSE:Kubic.yml b/config/announcer/openSUSE:Kubic.yml deleted file mode 100644 index f1824afb..00000000 --- a/config/announcer/openSUSE:Kubic.yml +++ /dev/null @@ -1,30 +0,0 @@ -bodytemplate: ' - - Please note that this mail was generated by a script. - - The described changes are computed based on the x86_64 DVD. - - The full online repo contains too many changes to be listed here. - - - Please check the known defects of this snapshot before upgrading: - - https://openqa.opensuse.org/tests/overview?distri=kubic&groupid=1&version=Tumbleweed&build={version} - - https://bugzilla.opensuse.org/buglist.cgi?product=openSUSE%20Tumbleweed&component=Kubic&query_format=advanced&resolution=--- - - - Please do not reply to this email to report issues, rather file a bug on bugzilla.opensuse.org. - - For more information on filing bugs please see https://en.opensuse.org/openSUSE:Submitting_bug_reports - - {text} - - ' -iso: openSUSE-Kubic-DVD-x86_64-Current.iso -changesfile: "Changes.Kubic.{version}.txt" -to: opensuse-kubic@opensuse.org -name: openSUSE:Kubic -subject: New Kubic snapshot {version} released! -sender: Richard Brown -url: http://download.opensuse.org/tumbleweed/iso/ diff --git a/config/announcer/openSUSE:Kubic:ARM.yml b/config/announcer/openSUSE:Kubic:ARM.yml deleted file mode 100644 index 51a0a85f..00000000 --- a/config/announcer/openSUSE:Kubic:ARM.yml +++ /dev/null @@ -1,30 +0,0 @@ -bodytemplate: ' - - Please note that this mail was generated by a script. - - The described changes are computed based on the aarch64 DVD. - - The full online repo contains too many changes to be listed here. - - - Please check the known defects of this snapshot before upgrading: - - https://openqa.opensuse.org/tests/overview?distri=kubic&groupid=3&version=Tumbleweed&build={version} - - https://bugzilla.opensuse.org/buglist.cgi?product=openSUSE%20Tumbleweed&component=Kubic&query_format=advanced&resolution=--- - - - Please do not reply to this email to report issues, rather file a bug on bugzilla.opensuse.org. - - For more information on filing bugs please see https://en.opensuse.org/openSUSE:Submitting_bug_reports - - {text} - - ' -iso: openSUSE-Kubic-DVD-aarch64-Current.iso -changesfile: "Changes.Kubic.{version}.txt" -to: opensuse-kubic@opensuse.org -name: openSUSE:Kubic:ARM -subject: New ARM Kubic snapshot {version} released! -sender: Guillaume Gardet -url: http://download.opensuse.org/ports/aarch64/tumbleweed/iso/ diff --git a/gocd/announcer.gocd.yaml b/gocd/announcer.gocd.yaml index 285010cf..9c23b5d0 100644 --- a/gocd/announcer.gocd.yaml +++ b/gocd/announcer.gocd.yaml @@ -36,42 +36,6 @@ pipelines: - staging-bot tasks: - script: ./factory-package-news/announcer.py --config config/announcer/openSUSE:Factory:ARM.yml --verbose --state-file /home/go/config/announcer.yaml - Announcer.Kubic: - group: openSUSE.Checkers - lock_behavior: unlockWhenFinished - environment_variables: - OSC_CONFIG: /home/go/config/oscrc-staging-bot - materials: - script: - git: https://github.com/openSUSE/openSUSE-release-tools.git - timer: - spec: 0 2 * ? * * - only_on_changes: false - stages: - - Run: - approval: manual - resources: - - staging-bot - tasks: - - script: ./factory-package-news/announcer.py --config config/announcer/openSUSE:Kubic.yml --verbose --state-file /home/go/config/announcer.yaml - Announcer.Kubic_ARM: - group: openSUSE.Checkers - lock_behavior: unlockWhenFinished - environment_variables: - OSC_CONFIG: /home/go/config/oscrc-staging-bot - materials: - script: - git: https://github.com/openSUSE/openSUSE-release-tools.git - timer: - spec: 0 3 * ? * * - only_on_changes: false - stages: - - Run: - approval: manual - resources: - - staging-bot - tasks: - - script: ./factory-package-news/announcer.py --config config/announcer/openSUSE:Kubic:ARM.yml --verbose --state-file /home/go/config/announcer.yaml Announcer.MicroOS: group: openSUSE.Checkers lock_behavior: unlockWhenFinished @@ -81,7 +45,7 @@ pipelines: script: git: https://github.com/openSUSE/openSUSE-release-tools.git timer: - spec: 0 4 * ? * * + spec: 0 2 * ? * * only_on_changes: false stages: - Run: @@ -99,7 +63,7 @@ pipelines: script: git: https://github.com/openSUSE/openSUSE-release-tools.git timer: - spec: 0 5 * ? * * + spec: 0 3 * ? * * only_on_changes: false stages: - Run: diff --git a/gocd/announcer.gocd.yaml.erb b/gocd/announcer.gocd.yaml.erb index 13216d10..d81aad81 100644 --- a/gocd/announcer.gocd.yaml.erb +++ b/gocd/announcer.gocd.yaml.erb @@ -1,6 +1,6 @@ format_version: 3 pipelines: -<% ['Factory', 'Factory:ARM', 'Kubic', 'Kubic:ARM', 'MicroOS', 'MicroOS:ARM'].each_with_index do |project, index| -%> +<% ['Factory', 'Factory:ARM', 'MicroOS', 'MicroOS:ARM'].each_with_index do |project, index| -%> <% name = project.gsub(':', '_') -%> Announcer.<%= name %>: group: openSUSE.Checkers diff --git a/gocd/vagrant-publisher.gocd.yaml b/gocd/vagrant-publisher.gocd.yaml index a7a439ff..0c9adf78 100644 --- a/gocd/vagrant-publisher.gocd.yaml +++ b/gocd/vagrant-publisher.gocd.yaml @@ -33,12 +33,6 @@ pipelines: tasks: - script: | ruby obs-to-vagrantcloud.rb --url https://download.opensuse.org/tumbleweed/appliances/boxes/openSUSE-MicroOS.x86_64-Vagrant.json --organization opensuse --new-box-name MicroOS.x86_64 - publish_Kubic_x86_64: - resources: - - staging-bot - tasks: - - script: | - ruby obs-to-vagrantcloud.rb --url https://download.opensuse.org/tumbleweed/appliances/boxes/openSUSE-MicroOS.x86_64-Kubic-kubeadm-Vagrant.json --organization opensuse --new-box-name Kubic.x86_64 publish_MicroOS-ContainerHost_x86_64: resources: - staging-bot @@ -51,12 +45,6 @@ pipelines: tasks: - script: | ruby obs-to-vagrantcloud.rb --url https://download.opensuse.org/ports/aarch64/tumbleweed/appliances/boxes/openSUSE-MicroOS.aarch64-Vagrant.json --organization opensuse --new-box-name MicroOS.aarch64 - publish_Kubic_aarch64: - resources: - - staging-bot - tasks: - - script: | - ruby obs-to-vagrantcloud.rb --url https://download.opensuse.org/ports/aarch64/tumbleweed/appliances/boxes/openSUSE-MicroOS.aarch64-Kubic-kubeadm-Vagrant.json --organization opensuse --new-box-name Kubic.aarch64 publish_MicroOS-ContainerHost_aarch64: resources: - staging-bot diff --git a/gocd/vagrant-publisher.gocd.yaml.erb b/gocd/vagrant-publisher.gocd.yaml.erb index e131d573..9a9ac3a8 100644 --- a/gocd/vagrant-publisher.gocd.yaml.erb +++ b/gocd/vagrant-publisher.gocd.yaml.erb @@ -18,10 +18,8 @@ pipelines: ['https://download.opensuse.org/tumbleweed/appliances/boxes/Tumbleweed.x86_64.json', 'Tumbleweed.x86_64'], ['https://download.opensuse.org/ports/aarch64/tumbleweed/appliances/boxes/Tumbleweed.aarch64-libvirt_aarch64.json', 'Tumbleweed.aarch64'], ['https://download.opensuse.org/tumbleweed/appliances/boxes/openSUSE-MicroOS.x86_64-Vagrant.json', 'MicroOS.x86_64'], -['https://download.opensuse.org/tumbleweed/appliances/boxes/openSUSE-MicroOS.x86_64-Kubic-kubeadm-Vagrant.json', 'Kubic.x86_64'], ['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-Kubic-kubeadm-Vagrant.json', 'Kubic.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'],