From fc6e59bb55d6524ab4b8a805683ad067081b9c07 Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Tue, 24 Oct 2017 19:53:31 -0600 Subject: [PATCH] travis build on el7 cleanup --- .travis.yml | 9 ++------- build/setup.sh | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 669adbb4ce..6d7dd6369b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,16 +8,11 @@ language: ruby services: - docker -env: - matrix: - - OS_TYPE=centos OS_VERSION=centos7 - before_install: - sudo apt-get update - echo 'DOCKER_OPTS="-H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock -s devicemapper"' | sudo tee /etc/default/docker > /dev/null - sudo service docker restart - sleep 5 - - sudo docker pull ${OS_TYPE}:${OS_VERSION} + - sudo docker pull centos:centos7 -script: - - build/setup.sh ${OS_TYPE} ${OS_VERSION} +script: build/setup.sh diff --git a/build/setup.sh b/build/setup.sh index 1e451b0fc6..e3d0ff2876 100755 --- a/build/setup.sh +++ b/build/setup.sh @@ -1,6 +1,6 @@ #!/bin/sh -xe -os_type=$1 -os_version=$2 +os_type=centos +os_version=centos7 if [ "$os_version" = "centos6" ]; then sudo docker run --rm=true -v `pwd`:/awips2/repo/awips2-builds:rw ${os_type}:${os_version} /bin/bash -c "bash -xe /awips2/repo/awips2-builds/build/build_rhel.sh ${os_type} ${os_version}"