On Mon, Nov 02, 2020 at 10:43:10AM +0100, Ondrej Mosnacek wrote: > The testsuite will soon be switching to testing multiple filesystems, > which exposes a bug in F32 image's kernel. Since Fedora 33 has been > released recently and the testsuite runs just fine on it, just bump the > image version to avoid the bug. > > This commit also fixes the script to read out the Fedora image version > from environment variables instead of using hard-coded values. > > Signed-off-by: Ondrej Mosnacek <omosnace@xxxxxxxxxx> Would it make sense to use Rawhide images from the link bellow? https://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Cloud/x86_64/images/ I think Paul already asked for it in past but I'm not sure what was the outcome. > --- > .travis.yml | 2 +- > scripts/ci/travis-kvm-setup.sh | 12 +++++++----- > 2 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/.travis.yml b/.travis.yml > index 8ea6cc74..6c0f6241 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -36,7 +36,7 @@ matrix: > env: PYVER=python3.8 RUBYLIBVER=2.7 LINKER=bfd > include: > - compiler: gcc > - env: TRAVIS_RUN_KVM=true TRAVIS_CLOUD_IMAGE_VERSION="32:1.6" > + env: TRAVIS_RUN_KVM=true FEDORA_MAJOR=33 FEDORA_MINOR=1.2 > install: > - skip > before_script: > diff --git a/scripts/ci/travis-kvm-setup.sh b/scripts/ci/travis-kvm-setup.sh > index 2b573417..756fab82 100755 > --- a/scripts/ci/travis-kvm-setup.sh > +++ b/scripts/ci/travis-kvm-setup.sh > @@ -7,13 +7,15 @@ TEST_RUNNER="scripts/ci/fedora-test-runner.sh" > # > # Variables for controlling the Fedora Image version and download URLs. > # > -MAJOR_VERSION="32" > -MINOR_VERSION="1.6" > +if [ -z "$FEDORA_MAJOR" ] || [ -z "$FEDORA_MINOR" ]; then > + echo "$0: FEDORA_MAJOR and FEDORA_MINOR must be set!" 1>&2 > + exit 1 > +fi > > BASE_URL="https://download.fedoraproject.org/pub/fedora/linux/releases >" -IMAGE_BASE_NAME="Fedora-Cloud-Base-$MAJOR_VERSION-$MINOR_VERSION.x86_64" > -IMAGE_URL="$BASE_URL/$MAJOR_VERSION/Cloud/x86_64/images/$IMAGE_BASE_NAME.raw.xz" > -CHECK_URL="$BASE_URL/$MAJOR_VERSION/Cloud/x86_64/images/Fedora-Cloud-$MAJOR_VERSION-$MINOR_VERSION-x86_64-CHECKSUM" > +IMAGE_BASE_NAME="Fedora-Cloud-Base-$FEDORA_MAJOR-$FEDORA_MINOR.x86_64" > +IMAGE_URL="$BASE_URL/$FEDORA_MAJOR/Cloud/x86_64/images/$IMAGE_BASE_NAME.raw.xz" > +CHECK_URL="$BASE_URL/$FEDORA_MAJOR/Cloud/x86_64/images/Fedora-Cloud-$FEDORA_MAJOR-$FEDORA_MINOR-x86_64-CHECKSUM" > GPG_URL="https://getfedora.org/static/fedora.gpg"; > > # > -- > 2.26.2 >
Attachment:
signature.asc
Description: PGP signature
