diff options
| author | Frantisek Sumsal <fsumsal@redhat.com> | 2019-10-14 15:26:48 +0200 |
|---|---|---|
| committer | The Plumber <50238977+systemd-rhel-bot@users.noreply.github.com> | 2019-10-16 17:40:15 +0200 |
| commit | ac7db0c5b48f1090f77dbcfa0a1e0dc08d5c471e (patch) | |
| tree | 70e9dbfa228f5e2586181665a2d149a88066b341 /.travis.yml | |
| parent | a2e00522971897909db2a81b4daf10e5700f453e (diff) | |
| download | systemd-ac7db0c5b48f1090f77dbcfa0a1e0dc08d5c471e.tar.gz | |
travis: move to CentOS 8 docker images
As the CentOS 8 Docker images is finally out, we can use it and drop the
plethora of workarounds we had to implement to compile RHEL8 systemd on
CentOS 7.
Resolves: #1761519
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index 0010da5784..70c60cf24e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,42 +9,40 @@ env: jobs: include: - - name: CentOS 7 + - name: CentOS 8 language: bash env: - - CENTOS_RELEASE="centos7" + - CENTOS_RELEASE="centos8" - CONT_NAME="systemd-centos-$CENTOS_RELEASE" - DOCKER_EXEC="docker exec -ti $CONT_NAME" before_install: - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce - docker --version install: - - if [ -f meson.build ]; then RHEL_VERSION=rhel8; else RHEL_VERSION=rhel7; fi - - $CI_ROOT/travis-centos-${RHEL_VERSION}.sh SETUP + - $CI_ROOT/travis-centos-rhel8.sh SETUP script: - set -e # Build systemd - - $CI_ROOT/travis-centos-${RHEL_VERSION}.sh RUN + - $CI_ROOT/travis-centos-rhel8.sh RUN - set +e after_script: - - $CI_ROOT/travis-centos-${RHEL_VERSION}.sh CLEANUP + - $CI_ROOT/travis-centos-rhel8.sh CLEANUP - - name: CentOS 7 (ASan+UBSan) + - name: CentOS 8 (ASan+UBSan) language: bash env: - - CENTOS_RELEASE="centos7" + - CENTOS_RELEASE="centos8" - CONT_NAME="systemd-centos-$CENTOS_RELEASE" - DOCKER_EXEC="docker exec -ti $CONT_NAME" before_install: - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce - docker --version install: - - if [ -f meson.build ]; then RHEL_VERSION=rhel8; else RHEL_VERSION=rhel7; fi - - $CI_ROOT/travis-centos-${RHEL_VERSION}.sh SETUP + - $CI_ROOT/travis-centos-rhel8.sh SETUP script: - set -e # Build systemd - - $CI_ROOT/travis-centos-${RHEL_VERSION}.sh RUN_ASAN + - $CI_ROOT/travis-centos-rhel8.sh RUN_ASAN - set +e after_script: - - $CI_ROOT/travis-centos-${RHEL_VERSION}.sh CLEANUP + - $CI_ROOT/travis-centos-rhel8.sh CLEANUP |