#1330 beaker-tests: move the docker test environment to F32
Merged 4 years ago by praiskup. Opened 4 years ago by praiskup.
Unknown source f32-docker-testing  into  master

@@ -1,4 +1,4 @@

- FROM fedora:30

+ FROM fedora:32

  MAINTAINER copr-devel@lists.fedorahosted.org

  

  ENV container docker
@@ -20,9 +20,6 @@

  # Sanity tests

  RUN wget https://beaker-project.org/yum/beaker-client-Fedora.repo -P /etc/yum.repos.d

  

- # Hack, beakerlib is not installable on F30, bug 1719226

- RUN sed -i 's/$releasever/29/g' /etc/yum.repos.d/beaker-client-Fedora.repo

- 

  RUN dnf -y install rhts-test-env beakerlib

  

  RUN echo "LANG=en_US.UTF-8" >> /etc/locale

@@ -23,7 +23,7 @@

  # Some tests might want to install built packages

  # Therefore, these packages need to be built for the same fedora version

  # as this script is going to be run from

- FEDORA_VERSION=30

+ FEDORA_VERSION=32

  CHROOT="fedora-$FEDORA_VERSION-x86_64"

  BRANCH="f$FEDORA_VERSION"

  

@@ -15,9 +15,10 @@

      rlPhaseEnd

  

      rlPhaseStartTest

-         rlRun "copr-cli create ${NAME_PREFIX}Createrepo --chroot fedora-30-x86_64"

+         rlRun "copr-cli create ${NAME_PREFIX}Createrepo --chroot $CHROOT"

          echo "sleep 60 seconds to give backend enough time to generate the repo"

          sleep 60

+         # don't specify chroot here, rely on auto-detection

          rlRun "dnf -y copr enable ${URL}/${NAME_PREFIX}Createrepo"

          rlRun "dnf --disablerepo='*' \

              --enablerepo='copr:${URL}:group_copr:${NAME_VAR}Createrepo' \

@@ -118,7 +118,9 @@

  

          # Test URL submit

          PROJECT=module-testmoduleurl-beakertest-$DATE

-         copr-cli create $PROJECT --chroot $CHROOT --chroot fedora-rawhide-i386

+         # meh, the testmodule is hardwired to f30 so we can not simply rely on

+         # $CHROOT variable

+         copr-cli create $PROJECT --chroot=fedora-30-x86_64 --chroot $CHROOT --chroot fedora-rawhide-i386

          rlRun "copr-cli build-module --url https://src.fedoraproject.org/modules/testmodule/raw/fancy/f/testmodule.yaml $PROJECT"

          PACKAGES=`mktemp`

          wait_for_finished_module "module-testmoduleurl-beakertest-$DATE" 1 600 $PACKAGES

@@ -145,7 +145,7 @@

  

          ## test distgit builds

          rlRun "copr-cli create --chroot $CHROOT ${NAME_PREFIX}ProjectDistGitBuilds"

-         rlRun "copr-cli buildfedpkg --clone-url https://src.fedoraproject.org/rpms/389-admin-console.git --branch f$FEDORA_VERSION ${NAME_PREFIX}ProjectDistGitBuilds"

+         rlRun "copr-cli buildfedpkg --clone-url https://src.fedoraproject.org/rpms/cpio.git --branch f$FEDORA_VERSION ${NAME_PREFIX}ProjectDistGitBuilds"

  

          ## test mock-config feature

          mc_project=${NAME_PREFIX}MockConfig

Drop the hack for beaker client repo, beaker people started to package
things correctly (even for Rawhide).

rebased onto 930c902f75cd57f73befbb1e37a5803ae654494f

4 years ago

rebased onto 8b88718

4 years ago

Pull-Request has been merged by praiskup

4 years ago