tequilaOS/platform_external_selinux
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ci: dont use hardcoded project name

Browse source 
Not everyone's github project is "selinux" so use the projects
name, as derived from TRAVIS_BUILD_DIR. TRAVIS_BUILD_DIR is
the absolute path to the project checkout on disk, so the
basename should be sufficient. The script that runs in the KVM
environment also needs to be updated where it can find the
selinux project code, so we pass it in through an env variable
in the ssh command.

Tested on Travis CI here:
  - https://travis-ci.org/github/williamcroberts/selinux/jobs/697307824

Signed-off-by: William Roberts <william.c.roberts@intel.com>
Acked-by: Petr Lautrbach <plautrba@redhat.com>
This commit is contained in:
William Roberts 2020-06-11 12:30:39 -05:00 committed by Petr Lautrbach
parent 562d6d1527
commit 1af345d222
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/ci/fedora-test-runner.sh
View file

@ -2,6 +2,12 @@
set -ev
#
# We expect this to be set in the environment, but if it's not, most selinux projects
# just have the same name as upstream, so choose that.
#
export SELINUX_DIR="${SELINUX_DIR:-/root/selinux}"
# CI Debug output if things go squirrely.
getenforce
id -Z
@ -58,7 +64,7 @@ dnf install -y \
#
# Move to selinux code and build
#
cd "$HOME/selinux"
cd "$SELINUX_DIR"
# Show HEAD commit for sanity checking
git log -1
@ -71,7 +77,7 @@ make -j"$(nproc)" LIBDIR=/usr/lib64 SHLIBDIR=/lib64 install-pywrap
make -j"$(nproc)" LIBDIR=/usr/lib64 SHLIBDIR=/lib64 relabel
#
# Get the selinux testsuite, but don't clone it in $HOME/selinux, move to $HOME
# Get the selinux testsuite, but don't clone it in selinux git directory, move to $HOME
# first.
#
cd "$HOME"

6
scripts/ci/travis-kvm-setup.sh
View file

@ -118,8 +118,10 @@ fi
#
# Great we have a host running, ssh into it. We specify -o so
# we don't get blocked on asking to add the servers key to
# our known_hosts.
# our known_hosts. Also, we need to forward the project directory
# so forks know where to go.
#
ssh -tt -o StrictHostKeyChecking=no -o LogLevel=QUIET "root@$ipaddy" "/root/selinux/$TEST_RUNNER"
project_dir="$(basename "$TRAVIS_BUILD_DIR")"
ssh -tt -o StrictHostKeyChecking=no -o LogLevel=QUIET "root@$ipaddy" "SELINUX_DIR=/root/$project_dir /root/$project_dir/$TEST_RUNNER"
exit 0