Skip to content

Commit

Permalink
Bring back buildah pipeline in travis
Browse files Browse the repository at this point in the history
  • Loading branch information
eMGabriel committed Mar 24, 2020
1 parent 1110535 commit b056028
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ sudo: required
dist: xenial

env:
- TRAVIS_PIPELINE=docker
## TODO: figure out why buildah pipeline is flaky, even with sudo
## - TRAVIS_PIPELINE=buildah
- USE_CACHE=true TRAVIS_PIPELINE=docker
- USE_CACHE=true TRAVIS_PIPELINE=buildah BUILDAH_LAYERS=true

language: go

go:
- 1.13.x
- 1.14.x

services: docker

Expand All @@ -18,6 +18,5 @@ install:
- go get github.com/mattn/goveralls

script:
- ./build_danm.sh
- ./run_uts.sh
- $GOPATH/bin/goveralls -coverprofile=ut/coverage/coverage3.out -service=travis-ci -repotoken ZY6MA490QABNKGnJgYLi53QTDuTC4H69K
1 change: 1 addition & 0 deletions build_danm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ if [[ ( "$TRAVIS_PIPELINE" = "buildah" ) || ( "$TRAVIS_PIPELINE" = "" && -x "$(
then
BUILD_COMMAND="buildah bud"
TAG_COMMAND="buildah tag"
command -v buildah || ./.travis/install_buildah.sh
elif [[ ( "$TRAVIS_PIPELINE" = "docker" ) || ( "$TRAVIS_PIPELINE" = "" && -x "$(command -v docker)" ) ]]
then
BUILD_COMMAND="docker image build"
Expand Down

0 comments on commit b056028

Please sign in to comment.