Skip to content

Commit

Permalink
Rename has_install to has_upgrade
Browse files Browse the repository at this point in the history
Also, remove the flag for operating systems that now should run upgrade tests
  • Loading branch information
vladbogo committed Apr 3, 2024
1 parent 297ae57 commit c219c9c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 15 deletions.
15 changes: 8 additions & 7 deletions constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -252,14 +252,15 @@
if not ("install_only" in os_info[os_i] and os_info[os_i]["install_only"]):
all_platforms.add(arch)
builders_autobake.append(builder_name_autobake)
# Currently there are no VMs for x86 and s390x and OpenSUSE and SLES
addInstall = True
if "has_install" in os_info[os_i]:
addInstall = os_info[os_i]["has_install"]
if arch not in ["s390x", "x86"] and addInstall:
addUpgrade = True
if "has_upgrade" in os_info[os_i]:
addUpgrade = os_info[os_i]["has_upgrade"]
# Currently there are no VMs for x86 and s390x and OpenSUSE and SLES
if arch not in ["s390x", "x86"]:
builders_install.append(builder_name_autobake + "-install")
builders_upgrade.append(builder_name_autobake + "-minor-upgrade")
builders_upgrade.append(builder_name_autobake + "-major-upgrade")
if addUpgrade:
builders_upgrade.append(builder_name_autobake + "-minor-upgrade")
builders_upgrade.append(builder_name_autobake + "-major-upgrade")

builders_galera = list(
map(lambda x: "gal-" + "-".join(x.split("-")[:3]), builders_autobake)
Expand Down
14 changes: 6 additions & 8 deletions os_info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,13 @@ centos-stream8:
- aarch64
- ppc64le
type: rpm
has_install: False
centos-stream9:
version_name: 9
arch:
- amd64
- aarch64
- ppc64le
type: rpm
has_install: False
debian-10:
version_name: buster
arch:
Expand Down Expand Up @@ -73,20 +71,19 @@ fedora-39:
- amd64
- aarch64
type: rpm
has_install: False
fedora-40:
version_name: 40
arch:
- amd64
- aarch64
type: rpm
has_install: False
has_upgrade: False
opensuse-15:
version_name: 15
arch:
- amd64
type: rpm
has_install: False
has_upgrade: False
rhel-7:
version_name: 7
arch:
Expand Down Expand Up @@ -123,14 +120,14 @@ sles-12:
arch:
- s390x
type: rpm
has_install: False
has_upgrade: False
sles-15:
version_name: 15
arch:
- amd64
- s390x
type: rpm
has_install: False
has_upgrade: False
ubuntu-2004:
version_name: focal
arch:
Expand All @@ -153,7 +150,7 @@ ubuntu-2310:
- amd64
- aarch64
type: deb
has_install: False
has_upgrade: False
ubuntu-2404:
version_name: noble
arch:
Expand All @@ -162,3 +159,4 @@ ubuntu-2404:
- ppc64le
- s390x
type: deb
has_upgrade: False

0 comments on commit c219c9c

Please sign in to comment.