From 0f376dcca532b7af30107b3fd98200e7a8f34c56 Mon Sep 17 00:00:00 2001 From: Fabien Boucher Date: Oct 12 2021 14:17:22 +0000 Subject: Use f35 nodeset for f35 branch --- diff --git a/zuul.d/jobs.dhall b/zuul.d/jobs.dhall index 04448ba..67f6b7e 100644 --- a/zuul.d/jobs.dhall +++ b/zuul.d/jobs.dhall @@ -48,7 +48,7 @@ let createRpmInstallTestJob { Rawhide = Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM , F33 = Nodesets.getName Nodesets.Type.Fedora-33-Container , F34 = Nodesets.getName Nodesets.Type.Fedora-34-Container - , F35 = Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM + , F35 = Nodesets.getName Nodesets.Type.Fedora-35-VM-Medium , Epel8 = Nodesets.getName Nodesets.Type.Centos-8-VM } branch @@ -83,8 +83,7 @@ let createRpmTestJob Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM-Medium , F33 = Nodesets.getName Nodesets.Type.Fedora-33-VM-Medium , F34 = Nodesets.getName Nodesets.Type.Fedora-34-VM-Medium - , F35 = - Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM-Medium + , F35 = Nodesets.getName Nodesets.Type.Fedora-35-VM-Medium , Epel8 = Nodesets.getName Nodesets.Type.Centos-8-VM } branch diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 0f53b54..0dbc9cd 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -1,4 +1,3 @@ -# Code generated by dhall-to-yaml. DO NOT EDIT. - job: name: rpm-install-test @@ -23,7 +22,7 @@ run: playbooks/rpm/rpm-install-test.yaml branches: - f35 - nodeset: fedora-rawhide-vm + nodeset: fedora-35-vm-medium requires: - repo roles: @@ -111,7 +110,7 @@ - playbooks/rpm/rpmtest-fetch-artifacts.yaml branches: - f35 - nodeset: fedora-rawhide-vm-medium + nodeset: fedora-35-vm-medium requires: - repo roles: diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml index 7566fd9..3117647 100644 --- a/zuul.d/nodesets.yaml +++ b/zuul.d/nodesets.yaml @@ -1,4 +1,3 @@ -# Code generated by dhall-to-yaml. DO NOT EDIT. - nodeset: name: fedora-latest-container @@ -61,6 +60,12 @@ name: cloud-host - nodeset: + name: fedora-35-vm + nodes: + - label: cloud-fedora-35-small + name: cloud-host + +- nodeset: name: fedora-34-vm nodes: - label: cloud-fedora-34-small @@ -103,6 +108,12 @@ name: cloud-host - nodeset: + name: fedora-35-vm-medium + nodes: + - label: cloud-fedora-35-medium + name: cloud-host + +- nodeset: name: fedora-34-vm-medium nodes: - label: cloud-fedora-34-medium