Merge pull request #701 from tahoe-lafs/3296.centos-ci

Fix CentOS CI job

Fixes: ticket:3296
This commit is contained in:
Jean-Paul Calderone 2020-04-13 11:44:18 -04:00 committed by GitHub
commit 8089f21b4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 9 deletions

View File

@ -11,11 +11,11 @@ RUN yum install --assumeyes \
git \
sudo \
make automake gcc gcc-c++ \
python \
python-devel \
python2 \
python2-devel \
libffi-devel \
openssl-devel \
libyaml-devel \
libyaml \
/usr/bin/virtualenv \
net-tools

View File

@ -21,7 +21,7 @@ workflows:
requires:
- "fedora-29"
- "centos-7"
- "centos-8"
- "slackware-14.2"
@ -67,7 +67,7 @@ workflows:
- "build-image-ubuntu-18.04"
- "build-image-fedora-28"
- "build-image-fedora-29"
- "build-image-centos-7"
- "build-image-centos-8"
- "build-image-slackware-14.2"
- "build-image-pypy-2.7-7.1.1-jessie"
@ -269,9 +269,9 @@ jobs:
user: "nobody"
centos-7: &RHEL_DERIV
centos-8: &RHEL_DERIV
docker:
- image: "tahoelafsci/centos:7"
- image: "tahoelafsci/centos:8"
user: "nobody"
environment: *UTF_8_ENVIRONMENT
@ -481,12 +481,12 @@ jobs:
TAG: "18.04"
build-image-centos-7:
build-image-centos-8:
<<: *BUILD_IMAGE
environment:
DISTRO: "centos"
TAG: "7"
TAG: "8"
build-image-fedora-28:

View File

@ -0,0 +1 @@
Tahoe-LAFS now supports CentOS 8 and no longer supports CentOS 7.