root
/
buildah
mirror of https://github.com/containers/buildah.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #349 from TomSweeneyRedHat/dev/tsweeney/baseline2 

Touchup baseline and rpm tests
This commit is contained in:
Daniel J Walsh 2017-12-11 12:00:57 -06:00 committed by GitHub
parent ccd3b3fedb aae843123f
commit bf01a80b2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/test_buildah_baseline.sh
View File

@ -74,9 +74,9 @@ scratchmnt=$(buildah mount $newcontainer)
echo $scratchmnt echo $scratchmnt
######## ########
# Install Fedora 26 bash and coreutils # Install Fedora 27 bash and coreutils
######## ########
dnf install --installroot $scratchmnt --release 26 bash coreutils --setopt install_weak_deps=false -y dnf install --installroot $scratchmnt --release 27 bash coreutils --setopt install_weak_deps=false -y
######## ########
# Check /usr/bin on the new container # Check /usr/bin on the new container
@ -107,7 +107,7 @@ buildah run $newcontainer
# Add configuration information # Add configuration information
######## ########
buildah config --created-by "ipbabble" $newcontainer buildah config --created-by "ipbabble" $newcontainer
buildah config --author "wgh at redhat.com @ipbabble" --label name=fedora26-bashecho $newcontainer buildah config --author "wgh at redhat.com @ipbabble" --label name=fedora27-bashecho $newcontainer
######## ########
# Inspect the container, verifying above was put into it # Inspect the container, verifying above was put into it
@ -153,7 +153,7 @@ buildah push fedora-bashecho docker-daemon:fedora-bashecho:latest
######## ########
# Run fedora-bashecho from Docker # Run fedora-bashecho from Docker
######## ########
docker run fedoara-bashecho docker run fedora-bashecho
######## ########
# Time to remove Docker # Time to remove Docker

6
tests/test_buildah_build_rpm.sh
View File

@ -96,6 +96,12 @@ echo "buildah rpm version: $rv"
test $SHORTCOMMIT = $id test $SHORTCOMMIT = $id
test $bv = $rv test $bv = $rv
########
# Clean up Buildah
########
buildah rm $(buildah containers -q)
buildah rmi -f $(buildah --debug=false images -q)
######## ########
# Kick off baseline testing against the installed Buildah # Kick off baseline testing against the installed Buildah
######## ########