particle-os/debian-koji-osbuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests: change all mentions of Fedora 32 to Fedora 33

Browse source 
Fedora 32 is EOL, let's use Fedora 33. (Fedora 34 is not yet
100% supported in composer).
This commit is contained in:
Ondřej Budai 2021-06-10 08:07:55 +02:00 • committed by Christian Kellner
parent ad157cc206
commit 3ceeb47333
4 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
HACKING.md
View file

@ -92,7 +92,7 @@ Specifically:
* destination tag, which contains the list of packages * destination tag, which contains the list of packages
A helper script will create a minimum set that is necessary to build A helper script will create a minimum set that is necessary to build
an image call `Fedora-Cloud` for `f32-candidate`: an image call `Fedora-Cloud` for `f33-candidate`:
```sh ```sh
test/make-tags.sh test/make-tags.sh
@ -121,11 +121,11 @@ koji --server=http://localhost:8080/kojihub \
--authtype=password \ --authtype=password \
osbuild-image \ osbuild-image \
Fedora-Cloud \ Fedora-Cloud \
32 \ 33 \
fedora-32 \ fedora-33 \
f32-candidate \ f33-candidate \
x86_64 \ x86_64 \
--repo 'http://download.fedoraproject.org/pub/fedora/linux/releases/32/Everything/$arch/os/' \ --repo 'http://download.fedoraproject.org/pub/fedora/linux/releases/33/Everything/$arch/os/' \
--image-type qcow2 \ --image-type qcow2 \
--release 1 --release 1
``` ```

20
test/integration/test_koji.py
View file

@ -8,7 +8,7 @@ import unittest
import subprocess import subprocess
F32_REPO = "http://download.fedoraproject.org/pub/fedora/linux/releases/32/Everything/$arch/os" F33_REPO = "http://download.fedoraproject.org/pub/fedora/linux/releases/33/Everything/$arch/os"
RHEL_REPOS = [ RHEL_REPOS = [
"http://download.devel.redhat.com/released/RHEL-8/8.2.0/BaseOS/x86_64/os/", "http://download.devel.redhat.com/released/RHEL-8/8.2.0/BaseOS/x86_64/os/",
@ -80,16 +80,16 @@ class TestIntegration(unittest.TestCase):
@unittest.skipUnless(is_fedora(), "no cross builds") @unittest.skipUnless(is_fedora(), "no cross builds")
def test_compose_fedora(self): def test_compose_fedora(self):
"""Successful Fedora compose""" """Successful Fedora compose"""
# Simple test of a successful compose of F32 # Simple test of a successful compose of F33
# Needs the f32-candidate tag be setup properly # Needs the f33-candidate tag be setup properly
res = self.koji("Fedora-Cloud", res = self.koji("Fedora-Cloud",
"32", "33",
"fedora-32", "fedora-33",
"f32-candidate", "f33-candidate",
"x86_64", "x86_64",
"--wait", "--wait",
repo=F32_REPO) repo=F33_REPO)
self.check_res(res) self.check_res(res)
@unittest.skipUnless(is_rhel(), "no cross builds") @unittest.skipUnless(is_rhel(), "no cross builds")
@ -104,7 +104,7 @@ class TestIntegration(unittest.TestCase):
res = self.koji("RHEL-Cloud", res = self.koji("RHEL-Cloud",
"8", "8",
"rhel-8", "rhel-8",
"f32-candidate", "f33-candidate",
"x86_64", "x86_64",
"--wait", "--wait",
*repos) *repos)
@ -114,8 +114,8 @@ class TestIntegration(unittest.TestCase):
"""Unknown Tag check""" """Unknown Tag check"""
# Check building an unknown tag fails # Check building an unknown tag fails
res = self.koji("Fedora-Cloud", res = self.koji("Fedora-Cloud",
"32", "33",
"fedora-32", "fedora-33",
"UNKNOWNTAG", "UNKNOWNTAG",
"x86_64") "x86_64")
self.check_fail(res) self.check_fail(res)

16
test/make-tags.sh
View file

@ -5,14 +5,14 @@ KOJI_SERVER=${KOJI_SERVER:-http://localhost:8080/kojihub}
KOJI="koji --server=${KOJI_SERVER} --user=kojiadmin --password=kojipass --authtype=password" KOJI="koji --server=${KOJI_SERVER} --user=kojiadmin --password=kojipass --authtype=password"
$KOJI add-tag f32 $KOJI add-tag f33
$KOJI add-tag --parent f32 f32-candidate $KOJI add-tag --parent f33 f33-candidate
$KOJI add-tag --parent f32 --arches=x86_64 f32-build $KOJI add-tag --parent f33 --arches=x86_64 f33-build
$KOJI add-target f32-candidate f32-build f32-candidate $KOJI add-target f33-candidate f33-build f33-candidate
$KOJI add-pkg --owner kojiadmin f32-candidate Fedora-Cloud $KOJI add-pkg --owner kojiadmin f33-candidate Fedora-Cloud
$KOJI add-pkg --owner kojiadmin f32-candidate RHEL-Cloud $KOJI add-pkg --owner kojiadmin f33-candidate RHEL-Cloud
$KOJI add-pkg --owner kojiadmin f32-candidate Fedora-IoT $KOJI add-pkg --owner kojiadmin f33-candidate Fedora-IoT
$KOJI regen-repo f32-build $KOJI regen-repo f33-build

4
test/unit/test_builder.py
View file

@ -642,9 +642,9 @@ class TestBuilderPlugin(PluginTest):
"plugins/builder/osbuild.py", "plugins/builder/osbuild.py",
"compose", "compose",
"Fedora-Cloud-Image", "Fedora-Cloud-Image",
"32", "33",
"20201015.0", "20201015.0",
"fedora-32", "fedora-33",
"http://download.localhost/pub/linux/$arch", "http://download.localhost/pub/linux/$arch",
"x86_64", "x86_64",
"--cert", ", ".join(certs), "--cert", ", ".join(certs),