Move integration tests to using RHEL 8.0 GA (#57772)

This commit is contained in:
Sam Doran 2019-07-09 17:45:06 -04:00 committed by GitHub
parent 5ccd674dba
commit b9dafdbade
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 9 deletions

View File

@ -66,7 +66,7 @@ matrix:
- env: T=osx/10.11/1
- env: T=rhel/7.6/1
- env: T=rhel/8.0b/1
- env: T=rhel/8.0/1
- env: T=freebsd/11.1/1
- env: T=freebsd/12.0/1
- env: T=linux/centos6/1
@ -80,7 +80,7 @@ matrix:
- env: T=osx/10.11/2
- env: T=rhel/7.6/2
- env: T=rhel/8.0b/2
- env: T=rhel/8.0/2
- env: T=freebsd/11.1/2
- env: T=freebsd/12.0/2
- env: T=linux/centos6/2
@ -94,7 +94,7 @@ matrix:
- env: T=osx/10.11/3
- env: T=rhel/7.6/3
- env: T=rhel/8.0b/3
- env: T=rhel/8.0/3
- env: T=freebsd/11.1/3
- env: T=freebsd/12.0/3
- env: T=linux/centos6/3
@ -108,7 +108,7 @@ matrix:
- env: T=osx/10.11/4
- env: T=rhel/7.6/4
- env: T=rhel/8.0b/4
- env: T=rhel/8.0/4
- env: T=freebsd/11.1/4
- env: T=freebsd/12.0/4
- env: T=linux/centos6/4

View File

@ -1 +1 @@
astream_name: '@php:7.1/minimal'
astream_name: '@php:7.2/minimal'

View File

@ -2,4 +2,4 @@ freebsd/11.1 python=2.7,3.6 python_dir=/usr/local/bin
freebsd/12.0 python=3.6,2.7 python_dir=/usr/local/bin
osx/10.11 python=2.7 python_dir=/usr/local/bin
rhel/7.6 python=2.7
rhel/8.0b python=3.6
rhel/8.0 python=3.6

View File

@ -44,9 +44,6 @@ if [ "${platform}" = "freebsd" ]; then
elif [ "${platform}" = "rhel" ]; then
if grep '8\.' /etc/redhat-release; then
while true; do
curl --silent --show-error -o /etc/yum.repos.d/rhel-8-beta.repo http://downloads.redhat.com/redhat/rhel/rhel-8-beta/rhel-8-beta.repo && \
dnf config-manager --set-enabled rhel-8-for-x86_64-baseos-beta-rpms && \
dnf config-manager --set-enabled rhel-8-for-x86_64-appstream-beta-rpms && \
yum module install -q -y python36 && \
yum install -q -y \
gcc \