Skip to contentSkip to conversation

Travis CI: Run selinux-testsuite

PATCH Superseded [email protected] 6 participants 44 messages May 19, 2020 – Jun 18, 2020 SELinux security module

lore
Share & tools
lore
#0 lore raw

So I put together a patch that will let the selinux-testsuite run in a Fedora 32 KVM instance on Travis CI. The userspace selinux bits are rebuilt and installed with the current pull-request patches on the CI build. This will help increase automated test coverage for CI runs. This will help provide confidence that bugs are not being introduced and that master is stable.

For an example of the run see:
- https://travis-ci.org/github/williamcroberts/selinux/builds/688853234

Their are some new scripts in the scripts folder. I made a subdir CI to indicate that while you can run these locally, they are really meant for the CI environment.

[PATCH] ci: run SE Linux kernel test suite

#1 lore raw

PATCH 1/1 ci: run SE Linux kernel test suite

From: William Roberts <[email protected]>

The current CI runs the userspace tooling and librariers against policy files, but cannot test against an SE Linux enabled kernel. Thus, some tests are not being done in the CI. Travis, unfortunately only provides Ubuntu images, so in order to run against a modern distro with SE Linux in enforcing mode, we need to launch a KVM with something like Fedora.

This patch enables this support by launching a Fedora32 Cloud Image with the selinux userspace library passed on from the travis clone, it then builds and replaces the current selinux bits on the Fedora image and runs the SE Linux testsuite.

---
 .travis.yml                      |   8 +++
 scripts/ci/README.md             |   8 +++
 scripts/ci/fedora-test-runner.sh |  79 +++++++++++++++++++++
 scripts/ci/travis-kvm-setup.sh   | 113 +++++++++++++++++++++++++++++++
 4 files changed, 208 insertions(+)
 create mode 100644 scripts/ci/README.md
 create mode 100755 scripts/ci/fedora-test-runner.sh
 create mode 100755 scripts/ci/travis-kvm-setup.sh
.travis.yml +8 -0
index c36e721a5e1d..63a856672f9b 100644
@@ -34,6 +34,14 @@ matrix:
       env: PYVER=python3.8 RUBYLIBVER=2.7 LINKER=gold
     - compiler: clang
       env: PYVER=python3.8 RUBYLIBVER=2.7 LINKER=bfd
+  include:
+    - compiler: gcc
+      env: TRAVIS_RUN_KVM=true
+      install:
+        - skip
+      before_script:
+        - skip
+      script: scripts/ci/travis-kvm-setup.sh
 
 # Use Travis-CI Ubuntu 18.04 Bionic Beaver, "full image" variant
 sudo: required
scripts/ci/README.md new file +8 -0
new file mode 100644
index 000000000000..04a134a438c2
@@ -0,0 +1,8 @@
+# Continuous Integration Scripts
+
+The scripts under `scripts/ci` are designed specifically
+for the Travis CI system. While nothing prevents you
+from mimicking that environment and using them locally,
+they are not applicable for general consumption. Any
+thing in this directory should never be considered as
+a stable API.
scripts/ci/fedora-test-runner.sh new file +79 -0

79 lines not on this page · raw message

scripts/ci/travis-kvm-setup.sh new file +113 -0

113 lines not on this page · raw message

Signature · 1 line
2.17.1
maintainer
#2 lore raw

Re: [PATCH] ci: run SE Linux kernel test suite

Quoted 24 lines · On Tue, May 19, 2020 at 11:15 AM <[email protected]> wrote:

From: William Roberts <[email protected]>

The current CI runs the userspace tooling and librariers against policy files, but cannot test against an SE Linux enabled kernel. Thus, some tests are not being done in the CI. Travis, unfortunately only provides Ubuntu images, so in order to run against a modern distro with SE Linux in enforcing mode, we need to launch a KVM with something like Fedora.

This patch enables this support by launching a Fedora32 Cloud Image with the selinux userspace library passed on from the travis clone, it then builds and replaces the current selinux bits on the Fedora image and runs the SE Linux testsuite.

---
 .travis.yml                      |   8 +++
 scripts/ci/README.md             |   8 +++
 scripts/ci/fedora-test-runner.sh |  79 +++++++++++++++++++++
 scripts/ci/travis-kvm-setup.sh   | 113 +++++++++++++++++++++++++++++++
 4 files changed, 208 insertions(+)
 create mode 100644 scripts/ci/README.md
 create mode 100755 scripts/ci/fedora-test-runner.sh
 create mode 100755 scripts/ci/travis-kvm-setup.sh

...

Quoted 6 lines
scripts/ci/fedora-test-runner.sh new file +0 -0
new file mode 100755
index 000000000000..8d4b1bf7b8f5

scripts/ci/fedora-test-runner.sh line 9

Quoted 9 lines
scripts/ci/fedora-test-runner.sh new file +9 -0
@@ -0,0 +1,79 @@
+#!/usr/bin/env bash
+
+set -ev
+
+# CI Debug output if things go squirrely.
+getenforce
+id -Z
+nproc
+pwd

Granted my automated testing experience has been with Fedora Rawhide and not the stable Fedora releases, but there have been occasions where the system is broken in some way which prevents the necessary test setup. My current approach is to put the system in permissive mode and leave it there until just before I run my tests.

scripts/ci/fedora-test-runner.sh line 11

Quoted 1 line
scripts/ci/fedora-test-runner.sh new file +1 -0
+dnf install -y \

Another speaking from experience comment: you probably want to add "--allowerasing" and "--skip-broken" to the dnf command line. If you can cope with the extra overhead, I would even suggest a "dnf clean all -y" at the start.

Quoted 75 lines
scripts/ci/fedora-test-runner.sh new file +68 -0
+    git \
+    audit-libs-devel \
+    bison \
+    bzip2-devel \
+    CUnit-devel \
+    diffutils \
+    flex \
+    gcc \
+    gettext \
+    glib2-devel \
+    make \
+    libcap-devel \
+    libcap-ng-devel \
+    pam-devel \
+    pcre-devel \
+    xmlto \
+    python3-devel \
+    ruby-devel \
+    swig \
+    perl-Test \
+    perl-Test-Harness \
+    perl-Test-Simple \
+    selinux-policy-devel \
+    gcc \
+    libselinux-devel \
+    net-tools \
+    netlabel_tools \
+    iptables \
+    lksctp-tools-devel \
+    attr \
+    libbpf-devel \
+    keyutils-libs-devel \
+    kernel-devel \
+    quota \
+    xfsprogs-devel \
+    libuuid-devel \
+    kernel-devel-$(uname -r) \
+    kernel-modules-$(uname -r)
+
+#
+# Move to selinux code and build
+#
+cd ~/selinux
+
+# Show HEAD commit for sanity checking
+git log -1
+
+#
+# Build and replace userspace components
+#
+# Note: You can't use parallel builds here (make -jX), you'll end up
+# with race conditions that manifest like:
+# semanage_store.lo: file not recognized: file format not recognized
+#
+make LIBDIR=/usr/lib64 SHLIBDIR=/lib64 install install-pywrap relabel
+
+#
+# Get the selinux testsuite, but don't clone it in ~/selinux, move to ~
+# first.
+#
+cd ~
+git clone --depth=1 https://github.com/SELinuxProject/selinux-testsuite.git
+cd selinux-testsuite
+
+#
+# Run the test suite
+#
+make test
scripts/ci/travis-kvm-setup.sh new file +1 -0
new file mode 100755
index 000000000000..19287fd21642
@@ -0,0 +1,113 @@
+#!/usr/bin/env bash

...

scripts/ci/travis-kvm-setup.sh line 111

Quoted 6 lines
scripts/ci/travis-kvm-setup.sh new file +6 -0
+#
+# 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.
+#
+ssh -o StrictHostKeyChecking=no "root@$ipaddy" "/root/selinux/$TEST_RUNNER"

Depending on the tests, you'll get better output in the logs if you add "-tt" to the SSH command line. You may also want to add "-o LogLevel=QUIET" too.

scripts/ci/travis-kvm-setup.sh

Quoted 2 lines
scripts/ci/travis-kvm-setup.sh new file +2 -0
+
+exit 0

Did you want to return the return value from SSH/$TEST_RUNNER?

Signature · 2 lines
paul moore
www.paul-moore.com
#3 lore raw

Re: [PATCH] ci: run SE Linux kernel test suite

Quoted 42 lines · Paul Moore
Quoted 24 lines · On Tue, May 19, 2020 at 11:15 AM <[email protected]> wrote:

From: William Roberts <[email protected]>

The current CI runs the userspace tooling and librariers against policy files, but cannot test against an SE Linux enabled kernel. Thus, some tests are not being done in the CI. Travis, unfortunately only provides Ubuntu images, so in order to run against a modern distro with SE Linux in enforcing mode, we need to launch a KVM with something like Fedora.

This patch enables this support by launching a Fedora32 Cloud Image with the selinux userspace library passed on from the travis clone, it then builds and replaces the current selinux bits on the Fedora image and runs the SE Linux testsuite.

---
 .travis.yml                      |   8 +++
 scripts/ci/README.md             |   8 +++
 scripts/ci/fedora-test-runner.sh |  79 +++++++++++++++++++++
 scripts/ci/travis-kvm-setup.sh   | 113 +++++++++++++++++++++++++++++++
 4 files changed, 208 insertions(+)
 create mode 100644 scripts/ci/README.md
 create mode 100755 scripts/ci/fedora-test-runner.sh
 create mode 100755 scripts/ci/travis-kvm-setup.sh

...

Quoted 13 lines
scripts/ci/fedora-test-runner.sh new file +7 -0
new file mode 100755
index 000000000000..8d4b1bf7b8f5
@@ -0,0 +1,79 @@
+#!/usr/bin/env bash
+
+set -ev
+
+# CI Debug output if things go squirrely.
+getenforce
+id -Z
Quoted 8 lines

scripts/ci/fedora-test-runner.sh line 9

Quoted 2 lines
scripts/ci/fedora-test-runner.sh new file +2 -0
+nproc
+pwd

Granted my automated testing experience has been with Fedora Rawhide and not the stable Fedora releases, but there have been occasions where the system is broken in some way which prevents the necessary test setup. My current approach is to put the system in permissive mode and leave it there until just before I run my tests.

We can do that.

Quoted 7 lines

scripts/ci/fedora-test-runner.sh line 11

Quoted 2 lines
scripts/ci/fedora-test-runner.sh new file +1 -0
+dnf install -y \

Another speaking from experience comment: you probably want to add "--allowerasing" and "--skip-broken" to the dnf command line. If you can cope with the extra overhead, I would even suggest a "dnf clean all -y" at the start.

I don't see why we couldn't.

Not really sure if it matters for those first two things, considering that were starting
in the same state each time. Its not like we need to work on a system that's already
been played with.

I can add them and see what kind of increase it adds to the CI time. I'm sure it's tolerable (obviously set permissive is fast, I'm talking about the dnf stuff adding time).

Quoted 79 lines
Quoted 76 lines
scripts/ci/fedora-test-runner.sh new file +68 -0
+    git \
+    audit-libs-devel \
+    bison \
+    bzip2-devel \
+    CUnit-devel \
+    diffutils \
+    flex \
+    gcc \
+    gettext \
+    glib2-devel \
+    make \
+    libcap-devel \
+    libcap-ng-devel \
+    pam-devel \
+    pcre-devel \
+    xmlto \
+    python3-devel \
+    ruby-devel \
+    swig \
+    perl-Test \
+    perl-Test-Harness \
+    perl-Test-Simple \
+    selinux-policy-devel \
+    gcc \
+    libselinux-devel \
+    net-tools \
+    netlabel_tools \
+    iptables \
+    lksctp-tools-devel \
+    attr \
+    libbpf-devel \
+    keyutils-libs-devel \
+    kernel-devel \
+    quota \
+    xfsprogs-devel \
+    libuuid-devel \
+    kernel-devel-$(uname -r) \
+    kernel-modules-$(uname -r)
+
+#
+# Move to selinux code and build
+#
+cd ~/selinux
+
+# Show HEAD commit for sanity checking
+git log -1
+
+#
+# Build and replace userspace components
+#
+# Note: You can't use parallel builds here (make -jX), you'll end up
+# with race conditions that manifest like:
+# semanage_store.lo: file not recognized: file format not recognized
+#
+make LIBDIR=/usr/lib64 SHLIBDIR=/lib64 install install-pywrap relabel
+
+#
+# Get the selinux testsuite, but don't clone it in ~/selinux, move to ~
+# first.
+#
+cd ~
+git clone --depth=1 https://github.com/SELinuxProject/selinux-testsuite.git
+cd selinux-testsuite
+
+#
+# Run the test suite
+#
+make test
scripts/ci/travis-kvm-setup.sh new file +1 -0
new file mode 100755
index 000000000000..19287fd21642
@@ -0,0 +1,113 @@
+#!/usr/bin/env bash

...

Quoted 10 lines

scripts/ci/travis-kvm-setup.sh line 111

Quoted 6 lines
scripts/ci/travis-kvm-setup.sh new file +6 -0
+#
+# 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.
+#
+ssh -o StrictHostKeyChecking=no "root@$ipaddy" "/root/selinux/$TEST_RUNNER"

Depending on the tests, you'll get better output in the logs if you add "-tt" to the SSH command line. You may also want to add "-o LogLevel=QUIET" too.

+1

Quoted 5 lines

scripts/ci/travis-kvm-setup.sh

Quoted 3 lines
scripts/ci/travis-kvm-setup.sh new file +2 -0
+
+exit 0

Did you want to return the return value from SSH/$TEST_RUNNER?

set -e, ssh will cause the shell to exit with whatever code it returns that's not 0.

Quoted 4 lines

--
paul moore
www.paul-moore.com

maintainer
#4 lore raw

Re: [PATCH] ci: run SE Linux kernel test suite

Quoted 2 lines · William Roberts
Quoted 1 line · Paul Moore

On Tue, May 19, 2020 at 11:15 AM <[email protected]> wrote:

...

Quoted 7 lines
Quoted 6 lines
Quoted 1 line

+dnf install -y \

Another speaking from experience comment: you probably want to add "--allowerasing" and "--skip-broken" to the dnf command line. If you can cope with the extra overhead, I would even suggest a "dnf clean all -y" at the start.

Quoted 7 lines

I don't see why we couldn't.

Not really sure if it matters for those first two things, considering that were starting
in the same state each time. Its not like we need to work on a system that's already
been played with.

FWIW, the VM I use for my automated kernel testing doesn't get played with (other than to fix dnf/Rawhide problems) and I can tell you from experience that Rawhide finds itself broken in new and exciting ways :)

You are using a stable Fedora release so it probably won't be too bad, I'm just trying to share some of the lessons I've learned.

Signature · 2 lines
paul moore
www.paul-moore.com
#5 lore raw

Re: [PATCH] ci: run SE Linux kernel test suite

Quoted 23 lines · Paul Moore
Quoted 2 lines · William Roberts
Quoted 1 line · Paul Moore

On Tue, May 19, 2020 at 11:15 AM <[email protected]> wrote:

...

Quoted 7 lines
Quoted 6 lines
Quoted 1 line

+dnf install -y \

Another speaking from experience comment: you probably want to add "--allowerasing" and "--skip-broken" to the dnf command line. If you can cope with the extra overhead, I would even suggest a "dnf clean all -y" at the start.

Quoted 7 lines

I don't see why we couldn't.

Not really sure if it matters for those first two things, considering that were starting
in the same state each time. Its not like we need to work on a system that's already
been played with.

Quoted 8 lines

FWIW, the VM I use for my automated kernel testing doesn't get played with (other than to fix dnf/Rawhide problems) and I can tell you from experience that Rawhide finds itself broken in new and exciting ways :)

You are using a stable Fedora release so it probably won't be too bad, I'm just trying to share some of the lessons I've learned.

Sure, and I appreciate that. It actually doesn't add any time, to give you an idea
the CI build time went from 14 to 11 mins. So that'll show you how much jitter there is. Ill send a V2 all fixed up shortly

#6 lore raw

Re: [PATCH] ci: run SE Linux kernel test suite

Quoted 30 lines · William Roberts
Quoted 28 lines · Paul Moore
Quoted 2 lines · William Roberts
Quoted 1 line · Paul Moore

On Tue, May 19, 2020 at 11:15 AM <[email protected]> wrote:

...

Quoted 7 lines
Quoted 6 lines
Quoted 1 line

+dnf install -y \

Another speaking from experience comment: you probably want to add "--allowerasing" and "--skip-broken" to the dnf command line. If you can cope with the extra overhead, I would even suggest a "dnf clean all -y" at the start.

Quoted 7 lines

I don't see why we couldn't.

Not really sure if it matters for those first two things, considering that were starting
in the same state each time. Its not like we need to work on a system that's already
been played with.

FWIW, the VM I use for my automated kernel testing doesn't get played with (other than to fix dnf/Rawhide problems) and I can tell you from experience that Rawhide finds itself broken in new and exciting ways :)

Quoted 8 lines
Quoted 3 lines

You are using a stable Fedora release so it probably won't be too bad, I'm just trying to share some of the lessons I've learned.

Sure, and I appreciate that. It actually doesn't add any time, to give you an idea
the CI build time went from 14 to 11 mins. So that'll show you how much jitter there is. Ill send a V2 all fixed up shortly

Not true, I lied. I didn't have it back in enforcing mode so the test suite was skipped. I still don't see it adding much in the way of time.

maintainer
#7 lore raw
In reply to [email protected]
Quoted 7 lines · On Tue, May 19, 2020 at 11:15 AM <[email protected]> wrote:

So I put together a patch that will let the selinux-testsuite run in a Fedora 32 KVM instance on Travis CI. The userspace selinux bits are rebuilt and installed with the current pull-request patches on the CI build. This will help increase automated test coverage for CI runs. This will help provide confidence that bugs are not being introduced and that master is stable.

Quoted 7 lines

For an example of the run see:
- https://travis-ci.org/github/williamcroberts/selinux/builds/688853234

Their are some new scripts in the scripts folder. I made a subdir CI to indicate that while you can run these locally, they are really meant for the CI environment.

[PATCH] ci: run SE Linux kernel test suite

s/SE Linux/SELinux/

:-P

Signature · 2 lines
paul moore
www.paul-moore.com
#8 lore raw

PATCH v2 1/1 Travis CI: Run selinux-testsuite

V2:
- Added some dnf and ssh options
- fixed SE Linux to SELinux

FYI The additional dnf commands didn't add any time really to the build, the latest build is:
- https://travis-ci.org/github/williamcroberts/selinux/jobs/689293166

Note that I squashed the patch series down from what that CI build saw, but the diff is the same.

[PATCH v2] ci: run SELinux kernel test suite

#9 lore raw

PATCH v2 1/1 ci: run SELinux kernel test suite

From: William Roberts <[email protected]>

The current Travis CI runs the userspace tooling and libraries against policy files, but cannot test against an SELinux enabled kernel. Thus, some tests are not being done in the CI. Travis, unfortunately only provides Ubuntu images, so in order to run against a modern distro with SELinux in enforcing mode, we need to launch a KVM with something like Fedora.

This patch enables this support by launching a Fedora32 Cloud Image with the SELinux userspace library passed on from the Travis clone, it then builds and replaces the current SELinux bits on the Fedora32 image and runs the SELinux testsuite.

---
 .travis.yml                      |   8 +++
 scripts/ci/README.md             |   8 +++
 scripts/ci/fedora-test-runner.sh |  89 ++++++++++++++++++++++++
 scripts/ci/travis-kvm-setup.sh   | 113 +++++++++++++++++++++++++++++++
 4 files changed, 218 insertions(+)
 create mode 100644 scripts/ci/README.md
 create mode 100755 scripts/ci/fedora-test-runner.sh
 create mode 100755 scripts/ci/travis-kvm-setup.sh
.travis.yml +8 -0
index c36e721a5e1d..63a856672f9b 100644
@@ -34,6 +34,14 @@ matrix:
       env: PYVER=python3.8 RUBYLIBVER=2.7 LINKER=gold
     - compiler: clang
       env: PYVER=python3.8 RUBYLIBVER=2.7 LINKER=bfd
+  include:
+    - compiler: gcc
+      env: TRAVIS_RUN_KVM=true
+      install:
+        - skip
+      before_script:
+        - skip
+      script: scripts/ci/travis-kvm-setup.sh
 
 # Use Travis-CI Ubuntu 18.04 Bionic Beaver, "full image" variant
 sudo: required
scripts/ci/README.md new file +8 -0
new file mode 100644
index 000000000000..04a134a438c2
@@ -0,0 +1,8 @@
+# Continuous Integration Scripts
+
+The scripts under `scripts/ci` are designed specifically
+for the Travis CI system. While nothing prevents you
+from mimicking that environment and using them locally,
+they are not applicable for general consumption. Any
+thing in this directory should never be considered as
+a stable API.
scripts/ci/fedora-test-runner.sh new file +89 -0

89 lines not on this page · raw message

scripts/ci/travis-kvm-setup.sh new file +113 -0

113 lines not on this page · raw message

Signature · 1 line
2.17.1
#10 lore raw

Re: [PATCH v2] ci: run SELinux kernel test suite

Quoted 9 lines · On Wed, May 20, 2020 at 6:34 PM <[email protected]> wrote:

From: William Roberts <[email protected]>

The current Travis CI runs the userspace tooling and libraries against policy files, but cannot test against an SELinux enabled kernel. Thus, some tests are not being done in the CI. Travis, unfortunately only provides Ubuntu images, so in order to run against a modern distro with SELinux in enforcing mode, we need to launch a KVM with something like Fedora.

Quoted 6 lines

This patch enables this support by launching a Fedora32 Cloud Image with the SELinux userspace library passed on from the Travis clone, it then builds and replaces the current SELinux bits on the Fedora32 image and runs the SELinux testsuite.

From the text above I infer that this patch is intended against the userspace repo, right?

If so, I don't quite see the usefulness of running the selinux-testsuite on every userspace change... It is mainly intended for testing the kernel and only a small part of its running time is spent on running (i.e. testing in a sense) the SELinux userspace programs. Not to mention that in your patch it runs with the userspace shipped in Fedora and not the version from the given commit...

However, it could be very useful if this was added to the testsuite's CI instead so that it can verify that the testsuite patches don't break something. But note that you'd need to modify the script a bit to copy over the testsuite snapshot being tested to the VM and run that, instead of the current master.

Anyway, thank you for working on this! I never realized that it could be so easy to run a Fedora VM from Travis. If I find some time maybe I can find some more ways to use this... For example we could run the Fedora/RHEL SELinux userspace tests from [1] after installing (not yet sure how) the userspace built from the currently tested userspace repo commit.

[1] https://src.fedoraproject.org/tests/selinux/tree/master

Signature · 3 lines
Ondrej Mosnacek <omosnace at redhat dot com>
Software Engineer, Security Technologies
Red Hat, Inc.
maintainer
#11 lore raw

Re: [PATCH v2] ci: run SELinux kernel test suite

Quoted 21 lines · Ondrej Mosnacek
Quoted 9 lines · On Wed, May 20, 2020 at 6:34 PM <[email protected]> wrote:

From: William Roberts <[email protected]>

The current Travis CI runs the userspace tooling and libraries against policy files, but cannot test against an SELinux enabled kernel. Thus, some tests are not being done in the CI. Travis, unfortunately only provides Ubuntu images, so in order to run against a modern distro with SELinux in enforcing mode, we need to launch a KVM with something like Fedora.

Quoted 6 lines

This patch enables this support by launching a Fedora32 Cloud Image with the SELinux userspace library passed on from the Travis clone, it then builds and replaces the current SELinux bits on the Fedora32 image and runs the SELinux testsuite.

From the text above I infer that this patch is intended against the userspace repo, right?

Quoted 6 lines

If so, I don't quite see the usefulness of running the selinux-testsuite on every userspace change... It is mainly intended for testing the kernel and only a small part of its running time is spent on running (i.e. testing in a sense) the SELinux userspace programs. Not to mention that in your patch it runs with the userspace shipped in Fedora and not the version from the given commit...

Last I looked, his script builds and installs the userspace code on top of the Fedora libraries and programs (make LIBDIR=... install...) and then runs the testsuite. That was my suggestion. While it is the kernel testsuite, it exercises a lot of SELinux userspace functionality that isn't tested by the userspace tests.

Quoted 15 lines

However, it could be very useful if this was added to the testsuite's CI instead so that it can verify that the testsuite patches don't break something. But note that you'd need to modify the script a bit to copy over the testsuite snapshot being tested to the VM and run that, instead of the current master.

Anyway, thank you for working on this! I never realized that it could be so easy to run a Fedora VM from Travis. If I find some time maybe I can find some more ways to use this... For example we could run the Fedora/RHEL SELinux userspace tests from [1] after installing (not yet sure how) the userspace built from the currently tested userspace repo commit.

[1] https://src.fedoraproject.org/tests/selinux/tree/master

#12 lore raw

Re: [PATCH v2] ci: run SELinux kernel test suite

Quoted 29 lines · Stephen Smalley
Quoted 21 lines · Ondrej Mosnacek
Quoted 9 lines · On Wed, May 20, 2020 at 6:34 PM <[email protected]> wrote:

From: William Roberts <[email protected]>

The current Travis CI runs the userspace tooling and libraries against policy files, but cannot test against an SELinux enabled kernel. Thus, some tests are not being done in the CI. Travis, unfortunately only provides Ubuntu images, so in order to run against a modern distro with SELinux in enforcing mode, we need to launch a KVM with something like Fedora.

Quoted 6 lines

This patch enables this support by launching a Fedora32 Cloud Image with the SELinux userspace library passed on from the Travis clone, it then builds and replaces the current SELinux bits on the Fedora32 image and runs the SELinux testsuite.

From the text above I infer that this patch is intended against the userspace repo, right?

Quoted 6 lines

If so, I don't quite see the usefulness of running the selinux-testsuite on every userspace change... It is mainly intended for testing the kernel and only a small part of its running time is spent on running (i.e. testing in a sense) the SELinux userspace programs. Not to mention that in your patch it runs with the userspace shipped in Fedora and not the version from the given commit...

Quoted 3 lines

Last I looked, his script builds and installs the userspace code on top of the Fedora libraries and programs (make LIBDIR=... install...) and then runs the testsuite. That was my suggestion.

Ah, yes, I can see that line now. Sorry, somehow I missed it before.

Quoted 3 lines

While it is the
kernel testsuite, it exercises a lot of SELinux userspace functionality that isn't tested by the userspace tests.

OK, I suppose it's better than nothing...

Signature · 3 lines
Ondrej Mosnacek <omosnace at redhat dot com>
Software Engineer, Security Technologies
Red Hat, Inc.
#13 lore raw

Re: [PATCH v2] ci: run SELinux kernel test suite

Quoted 25 lines · Ondrej Mosnacek
Quoted 22 lines · Stephen Smalley
Quoted 21 lines · Ondrej Mosnacek
Quoted 9 lines · On Wed, May 20, 2020 at 6:34 PM <[email protected]> wrote:

From: William Roberts <[email protected]>

The current Travis CI runs the userspace tooling and libraries against policy files, but cannot test against an SELinux enabled kernel. Thus, some tests are not being done in the CI. Travis, unfortunately only provides Ubuntu images, so in order to run against a modern distro with SELinux in enforcing mode, we need to launch a KVM with something like Fedora.

Quoted 6 lines

This patch enables this support by launching a Fedora32 Cloud Image with the SELinux userspace library passed on from the Travis clone, it then builds and replaces the current SELinux bits on the Fedora32 image and runs the SELinux testsuite.

From the text above I infer that this patch is intended against the userspace repo, right?

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

If so, I don't quite see the usefulness of running the selinux-testsuite on every userspace change... It is mainly intended for testing the kernel and only a small part of its running time is spent on running (i.e. testing in a sense) the SELinux userspace programs. Not to mention that in your patch it runs with the userspace shipped in Fedora and not the version from the given commit...

Totally doable, and you just copy + edit those scripts to achieve that. Currently we inject the travis repo
with patches, which is the selinux userspace, into the VM image with virt-sysprep.
But if this was selinux-testsuite ci you would just virt-sysprep inject it's repo.

Quoted 5 lines
Quoted 4 lines

Last I looked, his script builds and installs the userspace code on top of the Fedora libraries and programs (make LIBDIR=... install...) and then runs the testsuite. That was my suggestion.

Quoted 8 lines

Ah, yes, I can see that line now. Sorry, somehow I missed it before.

Quoted 3 lines

While it is the
kernel testsuite, it exercises a lot of SELinux userspace functionality that isn't tested by the userspace tests.

OK, I suppose it's better than nothing...

Stephen pointed out the additional ways userspace gets tested, and perhaps my title and description
of the patch could be better. But the main point is to increase the test coverage
and perform the testing steps we expect are done before a release in the CI. We should have
the testing coverage and the confidence to release userspace from master at any point. We also have forward facing proof that tests are being executed and we can make sure
nothing regresses.

My ultimate goal here, is to help make sure that if Petr gets hit by a bus, releases will
move forward without worry and without any change in quality among the various maintainers.

Additionally, we pick up some cross project testing and can find other surprises.

#14 lore raw

Re: [PATCH v2] ci: run SELinux kernel test suite

Quoted 4 lines · William Roberts
Quoted 3 lines · Ondrej Mosnacek

On Thu, May 21, 2020 at 2:52 PM Stephen Smalley
<[email protected]> wrote:

[...]

Quoted 24 lines
Quoted 4 lines
Quoted 3 lines

Last I looked, his script builds and installs the userspace code on top of the Fedora libraries and programs (make LIBDIR=... install...) and then runs the testsuite. That was my suggestion.

Quoted 8 lines

Ah, yes, I can see that line now. Sorry, somehow I missed it before.

Quoted 3 lines

While it is the
kernel testsuite, it exercises a lot of SELinux userspace functionality that isn't tested by the userspace tests.

OK, I suppose it's better than nothing...

Stephen pointed out the additional ways userspace gets tested, and perhaps my title and description
of the patch could be better. But the main point is to increase the test coverage
and perform the testing steps we expect are done before a release in the CI. We should have
the testing coverage and the confidence to release userspace from master at any point. We also have forward facing proof that tests are being executed and we can make sure
nothing regresses.

Quoted 7 lines

My ultimate goal here, is to help make sure that if Petr gets hit by a bus, releases will
move forward without worry and without any change in quality among the various maintainers.

Additionally, we pick up some cross project testing and can find other surprises.

Ah, so you want to move an integration test, which we would normally run only before release, down to per-commit testing, which is fine because it is quite fast... OK, it started to make sense to me now :)

If I find time I'll have a closer look at the scripts. I already see some tiny possible improvements...

--
Ondrej Mosnacek <omosnace at redhat dot com>
Software Engineer, Security Technologies
Red Hat, Inc.

#15 lore raw

Re: [PATCH v2] ci: run SELinux kernel test suite

Quoted 37 lines · Ondrej Mosnacek
Quoted 4 lines · William Roberts
Quoted 3 lines · Ondrej Mosnacek

On Thu, May 21, 2020 at 2:52 PM Stephen Smalley
<[email protected]> wrote:

[...]

Quoted 29 lines
Quoted 4 lines
Quoted 3 lines

Last I looked, his script builds and installs the userspace code on top of the Fedora libraries and programs (make LIBDIR=... install...) and then runs the testsuite. That was my suggestion.

Quoted 8 lines

Ah, yes, I can see that line now. Sorry, somehow I missed it before.

Quoted 3 lines

While it is the
kernel testsuite, it exercises a lot of SELinux userspace functionality that isn't tested by the userspace tests.

OK, I suppose it's better than nothing...

Stephen pointed out the additional ways userspace gets tested, and perhaps my title and description
of the patch could be better. But the main point is to increase the test coverage
and perform the testing steps we expect are done before a release in the CI. We should have
the testing coverage and the confidence to release userspace from master at any point. We also have forward facing proof that tests are being executed and we can make sure
nothing regresses.

My ultimate goal here, is to help make sure that if Petr gets hit by a bus, releases will
move forward without worry and without any change in quality among the various maintainers.

Quoted 6 lines
Quoted 2 lines

Additionally, we pick up some cross project testing and can find other surprises.

Ah, so you want to move an integration test, which we would normally run only before release, down to per-commit testing, which is fine because it is quite fast... OK, it started to make sense to me now :)

Exactly, plus we pick up a little more test coverage on the userspace bits by swapping out what's installed in the VM with the current build and running the tests. The speed is less important, it's just fast enough where our CI isn't going to take years to complete. CI doesn't need to be super snappy per se, but it also cannot take a fortnight.

Quoted 3 lines

If I find time I'll have a closer look at the scripts. I already see some tiny possible improvements... I have Nicolas's last comments

addressed and staged, so ill wait a few days and see what you come back with and re-send a V3.

maintainer
#16 lore raw

Re: [PATCH v2] ci: run SELinux kernel test suite

Quoted 53 lines · William Roberts
Quoted 37 lines · Ondrej Mosnacek
Quoted 4 lines · William Roberts
Quoted 3 lines · Ondrej Mosnacek

On Thu, May 21, 2020 at 2:52 PM Stephen Smalley
<[email protected]> wrote:

[...]

Quoted 29 lines
Quoted 4 lines
Quoted 3 lines

Last I looked, his script builds and installs the userspace code on top of the Fedora libraries and programs (make LIBDIR=... install...) and then runs the testsuite. That was my suggestion.

Quoted 8 lines

Ah, yes, I can see that line now. Sorry, somehow I missed it before.

Quoted 3 lines

While it is the
kernel testsuite, it exercises a lot of SELinux userspace functionality that isn't tested by the userspace tests.

OK, I suppose it's better than nothing...

Stephen pointed out the additional ways userspace gets tested, and perhaps my title and description
of the patch could be better. But the main point is to increase the test coverage
and perform the testing steps we expect are done before a release in the CI. We should have
the testing coverage and the confidence to release userspace from master at any point. We also have forward facing proof that tests are being executed and we can make sure
nothing regresses.

My ultimate goal here, is to help make sure that if Petr gets hit by a bus, releases will
move forward without worry and without any change in quality among the various maintainers.

Quoted 6 lines
Quoted 2 lines

Additionally, we pick up some cross project testing and can find other surprises.

Ah, so you want to move an integration test, which we would normally run only before release, down to per-commit testing, which is fine because it is quite fast... OK, it started to make sense to me now :)

Exactly, plus we pick up a little more test coverage on the userspace bits by swapping out what's installed in the VM with the current build and running the tests. The speed is less important, it's just fast enough where our CI isn't going to take years to complete. CI doesn't need to be super snappy per se, but it also cannot take a fortnight.

Quoted 1 line
Quoted 4 lines
Quoted 2 lines

If I find time I'll have a closer look at the scripts. I already see some tiny possible improvements... I have Nicolas's last comments

addressed and staged, so ill wait a few days and see what you come back with and re-send a V3.

This is looking good to me. Only questions I have are:
1) Have you confirmed that a testsuite failure within the VM gets correctly propagated up and treated as a failure by travis-ci itself?
2) Have you seen any problems with instability in running of the tests due to the additional complexity and time? I've certainly already seen instances where travis-ci of selinux or selinux-testsuite fails randomly due to timeouts or something when downloading external components.

#17 lore raw

Re: [PATCH v2] ci: run SELinux kernel test suite

Quoted 56 lines · Stephen Smalley
Quoted 53 lines · William Roberts
Quoted 37 lines · Ondrej Mosnacek
Quoted 4 lines · William Roberts
Quoted 3 lines · Ondrej Mosnacek

On Thu, May 21, 2020 at 2:52 PM Stephen Smalley
<[email protected]> wrote:

[...]

Quoted 29 lines
Quoted 4 lines
Quoted 3 lines

Last I looked, his script builds and installs the userspace code on top of the Fedora libraries and programs (make LIBDIR=... install...) and then runs the testsuite. That was my suggestion.

Quoted 8 lines

Ah, yes, I can see that line now. Sorry, somehow I missed it before.

Quoted 3 lines

While it is the
kernel testsuite, it exercises a lot of SELinux userspace functionality that isn't tested by the userspace tests.

OK, I suppose it's better than nothing...

Stephen pointed out the additional ways userspace gets tested, and perhaps my title and description
of the patch could be better. But the main point is to increase the test coverage
and perform the testing steps we expect are done before a release in the CI. We should have
the testing coverage and the confidence to release userspace from master at any point. We also have forward facing proof that tests are being executed and we can make sure
nothing regresses.

My ultimate goal here, is to help make sure that if Petr gets hit by a bus, releases will
move forward without worry and without any change in quality among the various maintainers.

Quoted 6 lines
Quoted 2 lines

Additionally, we pick up some cross project testing and can find other surprises.

Ah, so you want to move an integration test, which we would normally run only before release, down to per-commit testing, which is fine because it is quite fast... OK, it started to make sense to me now :)

Exactly, plus we pick up a little more test coverage on the userspace bits by swapping out what's installed in the VM with the current build and running the tests. The speed is less important, it's just fast enough where our CI isn't going to take years to complete. CI doesn't need to be super snappy per se, but it also cannot take a fortnight.

Quoted 1 line
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

If I find time I'll have a closer look at the scripts. I already see some tiny possible improvements... I have Nicolas's last comments

addressed and staged, so ill wait a few days and see what you come back with and re-send a V3.

This is looking good to me. Only questions I have are:
1) Have you confirmed that a testsuite failure within the VM gets correctly propagated up and treated as a failure by travis-ci itself?

Yes, when I was testing and didn't have SCTP support, the test suite would fail and propagate back.

Quoted 5 lines

2) Have you seen any problems with instability in running of the tests due to the additional complexity and time? I've certainly already seen instances where travis-ci of selinux or selinux-testsuite fails randomly due to timeouts or something when downloading external components.

No, and I did a bunch of additional runs, like 10-12 and never saw additional failures. I see some of those intermittent travis CI failures with all my projects
on Travis, but I don't see this as adding any more issues. Timeouts are caused by nothing sent to stdout for 10 mins (IIRC), so we should be good there.

Im just waiting on Ondrej, he said he had some feedback and I was gonna send round 3. If I don't here anything back on Monday ill send round 3.

#18 lore raw

Re: [PATCH v2] ci: run SELinux kernel test suite

In reply to [email protected]
Quoted 10 lines · On Wed, May 20, 2020 at 6:34 PM <[email protected]> wrote:

From: William Roberts <[email protected]>

The current Travis CI runs the userspace tooling and libraries against policy files, but cannot test against an SELinux enabled kernel. Thus, some tests are not being done in the CI. Travis, unfortunately only provides Ubuntu images, so in order to run against a modern distro with SELinux in enforcing mode, we need to launch a KVM with something like Fedora.

Quoted 6 lines

This patch enables this support by launching a Fedora32 Cloud Image with the SELinux userspace library passed on from the Travis clone, it then builds and replaces the current SELinux bits on the Fedora32 image and runs the SELinux testsuite.

Hi,
Thanks for working on this. The CI scripts are quite easy to follow, thanks to all the comments :)

Anyway, here are some suggestions/comments in order to make this patch even better (if you want to do a v3):

* ShellCheck detects that some strings are not quoted, that using *-CHECKSUM is dangerous (using ./*-CHECKSUM prevents ill things from happening if a file in the directory happens to match the pattern and start with a dash), etc. Most issues reported by ShellCheck are not relevant here, but one:

    ipaddy=$(grep fedoravm dhcp-leases.txt | awk {'print $5'} | cut
-d'/' -f 1-1)
                                                 ^-- SC1083: This { is

literal. Check expression (missing ;/\n?) or quote it.

Using awk '{print $5}' (single quotes outside of the braces) seems to better match the intent. Moreover the whole $(...) expression could be double-quoted.

* fedora-test-runner.sh uses ~, which is expanded to /root as it does not make sense to run this script as non-root user. In my humble opinion, using /root instead of ~ makes the script even easier to read.

* There is a comment about issues with -jX with "make LIBDIR=/usr/lib64 SHLIBDIR=/lib64 install install-pywrap relabel". I usually split the targets when using "make -jX" (ie. make -j$(nproc) install && make -j$(nproc) install-pywrap && make relabel), so if not using -jX is really an issue, this could be considered.

* Does the script runs "make test" in selinux/? I see the "make test" for selinux-testsuite, but if the main point of fedora-test-runner.sh is to run selinux's tests (in a VM), I missed the command that does so.

Thanks,
Nicolas

Quoted 260 lines
---
 .travis.yml                      |   8 +++
 scripts/ci/README.md             |   8 +++
 scripts/ci/fedora-test-runner.sh |  89 ++++++++++++++++++++++++
 scripts/ci/travis-kvm-setup.sh   | 113 +++++++++++++++++++++++++++++++
 4 files changed, 218 insertions(+)
 create mode 100644 scripts/ci/README.md
 create mode 100755 scripts/ci/fedora-test-runner.sh
 create mode 100755 scripts/ci/travis-kvm-setup.sh
.travis.yml +8 -0
index c36e721a5e1d..63a856672f9b 100644
@@ -34,6 +34,14 @@ matrix:
       env: PYVER=python3.8 RUBYLIBVER=2.7 LINKER=gold
     - compiler: clang
       env: PYVER=python3.8 RUBYLIBVER=2.7 LINKER=bfd
+  include:
+    - compiler: gcc
+      env: TRAVIS_RUN_KVM=true
+      install:
+        - skip
+      before_script:
+        - skip
+      script: scripts/ci/travis-kvm-setup.sh
 
 # Use Travis-CI Ubuntu 18.04 Bionic Beaver, "full image" variant
 sudo: required
scripts/ci/README.md new file +8 -0
new file mode 100644
index 000000000000..04a134a438c2
@@ -0,0 +1,8 @@
+# Continuous Integration Scripts
+
+The scripts under `scripts/ci` are designed specifically
+for the Travis CI system. While nothing prevents you
+from mimicking that environment and using them locally,
+they are not applicable for general consumption. Any
+thing in this directory should never be considered as
+a stable API.
scripts/ci/fedora-test-runner.sh new file +89 -0
new file mode 100755
index 000000000000..14bcf5fc469d
@@ -0,0 +1,89 @@
+#!/usr/bin/env bash
+
+set -ev
+
+# CI Debug output if things go squirrely.
+getenforce
+id -Z
+nproc
+pwd
+
+# Turn off enforcing for the setup to prevent any weirdness from breaking
+# the CI.
+setenforce 0
+
+dnf clean all -y
+dnf install -y \
+    --allowerasing \
+    --skip-broken \
+    git \
+    audit-libs-devel \
+    bison \
+    bzip2-devel \
+    CUnit-devel \
+    diffutils \
+    flex \
+    gcc \
+    gettext \
+    glib2-devel \
+    make \
+    libcap-devel \
+    libcap-ng-devel \
+    pam-devel \
+    pcre-devel \
+    xmlto \
+    python3-devel \
+    ruby-devel \
+    swig \
+    perl-Test \
+    perl-Test-Harness \
+    perl-Test-Simple \
+    selinux-policy-devel \
+    gcc \
+    libselinux-devel \
+    net-tools \
+    netlabel_tools \
+    iptables \
+    lksctp-tools-devel \
+    attr \
+    libbpf-devel \
+    keyutils-libs-devel \
+    kernel-devel \
+    quota \
+    xfsprogs-devel \
+    libuuid-devel \
+    kernel-devel-$(uname -r) \
+    kernel-modules-$(uname -r)
+
+#
+# Move to selinux code and build
+#
+cd ~/selinux
+
+# Show HEAD commit for sanity checking
+git log -1
+
+#
+# Build and replace userspace components
+#
+# Note: You can't use parallel builds here (make -jX), you'll end up
+# with race conditions that manifest like:
+# semanage_store.lo: file not recognized: file format not recognized
+#
+make LIBDIR=/usr/lib64 SHLIBDIR=/lib64 install install-pywrap relabel
+
+#
+# Get the selinux testsuite, but don't clone it in ~/selinux, move to ~
+# first.
+#
+cd ~
+git clone --depth=1 https://github.com/SELinuxProject/selinux-testsuite.git
+cd selinux-testsuite
+
+# The testsuite must be run in enforcing mode
+setenforce 1
+
+#
+# Run the test suite
+#
+make test
scripts/ci/travis-kvm-setup.sh new file +113 -1
new file mode 100755
index 000000000000..66606e9d4a5b
@@ -0,0 +1,113 @@
+#!/usr/bin/env bash
+
+set -ev
+
+TEST_RUNNER="scripts/ci/fedora-test-runner.sh"
+
+#
+# Travis gives us 7.5GB of RAM and two cores:
+# https://docs.travis-ci.com/user/reference/overview/
+#
+MEMORY=4096
+VCPUS=2
+
+# Install these here so other builds don't have to wait on these deps to download and install
+sudo apt-get install qemu-kvm libvirt-bin virtinst bridge-utils cpu-checker libguestfs-tools
+
+sudo usermod -a -G kvm,libvirt,libvirt-qemu $USER
+
+# Verify that KVM is working, useful if Travis every changes anything.
+kvm-ok
+
+sudo systemctl enable libvirtd
+sudo systemctl start libvirtd
+
+# Set up a key so we can ssh into the VM
+ssh-keygen -N "" -f "$HOME/.ssh/id_rsa"
+
+#
+# Get the Fedora Cloud Image, It is a base image that small and ready to go, extract it and modify it with virt-sysprep
+#  - https://alt.fedoraproject.org/en/verify.html
+cd $HOME
+wget https://download.fedoraproject.org/pub/fedora/linux/releases/32/Cloud/x86_64/images/Fedora-Cloud-Base-32-1.6.x86_64.raw.xz
+
+# Verify the image
+curl https://getfedora.org/static/fedora.gpg | gpg --import
+wget https://getfedora.org/static/checksums/Fedora-Cloud-32-1.6-x86_64-CHECKSUM
+gpg --verify-files *-CHECKSUM
+sha256sum --ignore-missing -c *-CHECKSUM
+
+# Extract the image
+unxz -T0 Fedora-Cloud-Base-32-1.6.x86_64.raw.xz
+
+# Search is needed for $HOME so virt service can access the image file.
+chmod a+x $HOME
+
+#
+# Modify the virtual image to:
+#   - Enable a login, we just use root
+#   - Enable passwordless login
+#     - Force a relabel to fix labels on ssh keys
+#
+sudo virt-sysprep -a "$HOME/Fedora-Cloud-Base-32-1.6.x86_64.raw" \
+  --root-password password:123456 \
+  --hostname fedoravm \
+  --append-line '/etc/ssh/sshd_config:PermitRootLogin yes' \
+  --append-line '/etc/ssh/sshd_config:PubkeyAuthentication yes' \
+  --mkdir /root/.ssh \
+  --upload "$HOME/.ssh/id_rsa.pub:/root/.ssh/authorized_keys" \
+  --chmod '0600:/root/.ssh/authorized_keys' \
+  --run-command 'chown root:root /root/.ssh/authorized_keys' \
+  --copy-in "$TRAVIS_BUILD_DIR:/root" \
+  --network \
+  --selinux-relabel
+
+#
+# Now we create a domain by using virt-install. This not only creates the domain, but runs the VM as well
+# It should be ready to go for ssh, once ssh starts.
+#
+sudo virt-install \
+  --name fedoravm \
+  --memory $MEMORY \
+  --vcpus $VCPUS \
+  --disk "$HOME/Fedora-Cloud-Base-32-1.6.x86_64.raw" \
+  --import --noautoconsole
+
+#
+# Here comes the tricky part, we have to figure out when the VM comes up AND we need the ip address for ssh. So we
+# can check the net-dhcp leases, for our host. We have to poll, and we will poll for up 3 minutes in 6 second
+# intervals, so 30 poll attempts (0-29 inclusive). I don't know of a better way to do this.
+#
+# We have a full reboot + relabel, so first sleep gets us close
+#
+sleep 30
+for i in $(seq 0 29); do
+    echo "loop $i"
+    sleep 6s
+    # Get the leases, but tee it so it's easier to debug
+    sudo virsh net-dhcp-leases default | tee dhcp-leases.txt
+
+    # get our ipaddress
+    ipaddy=$(grep fedoravm dhcp-leases.txt | awk {'print $5'} | cut -d'/' -f 1-1)
+    if [ -n "$ipaddy" ]; then
+        # found it, we're done looking, print it for debug logs
+        echo "ipaddy: $ipaddy"
+        break
+    fi
+    # it's empty/not found, loop back and try again.
+done
+
+# Did we find it? If not die.
+if [ -z "$ipaddy" ]; then
+    echo "ipaddy zero length, exiting with error 1"
+    exit 1
+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.
+#
+ssh -tt -o StrictHostKeyChecking=no -o LogLevel=QUIET "root@$ipaddy" "/root/selinux/$TEST_RUNNER"
+
+exit 0
--

2.17.1

#19 lore raw

Re: [PATCH v2] ci: run SELinux kernel test suite

Quoted 37 lines · Nicolas Iooss
Quoted 10 lines · On Wed, May 20, 2020 at 6:34 PM <[email protected]> wrote:

From: William Roberts <[email protected]>

The current Travis CI runs the userspace tooling and libraries against policy files, but cannot test against an SELinux enabled kernel. Thus, some tests are not being done in the CI. Travis, unfortunately only provides Ubuntu images, so in order to run against a modern distro with SELinux in enforcing mode, we need to launch a KVM with something like Fedora.

Quoted 6 lines

This patch enables this support by launching a Fedora32 Cloud Image with the SELinux userspace library passed on from the Travis clone, it then builds and replaces the current SELinux bits on the Fedora32 image and runs the SELinux testsuite.

Hi,
Thanks for working on this. The CI scripts are quite easy to follow, thanks to all the comments :)

Anyway, here are some suggestions/comments in order to make this patch even better (if you want to do a v3):

* ShellCheck detects that some strings are not quoted, that using *-CHECKSUM is dangerous (using ./*-CHECKSUM prevents ill things from happening if a file in the directory happens to match the pattern and start with a dash), etc. Most issues reported by ShellCheck are not relevant here, but one:

    ipaddy=$(grep fedoravm dhcp-leases.txt | awk {'print $5'} | cut
-d'/' -f 1-1)
                                                 ^-- SC1083: This { is

literal. Check expression (missing ;/\n?) or quote it.

Quoted 8 lines

Using awk '{print $5}' (single quotes outside of the braces) seems to better match the intent. Moreover the whole $(...) expression could be double-quoted.

* fedora-test-runner.sh uses ~, which is expanded to /root as it does not make sense to run this script as non-root user. In my humble opinion, using /root instead of ~ makes the script even easier to read.

Fixing all the shell check issues for v3 seems prudent, so will respin with those changes.

Quoted 6 lines

* There is a comment about issues with -jX with "make LIBDIR=/usr/lib64 SHLIBDIR=/lib64 install install-pywrap relabel". I usually split the targets when using "make -jX" (ie. make -j$(nproc) install && make -j$(nproc) install-pywrap && make relabel), so if not using -jX is really an issue, this could be considered.

Oh thanks for the suggestion, I didn't think of that, I can do that to reduce whatever time we can.

Quoted 5 lines

* Does the script runs "make test" in selinux/? I see the "make test" for selinux-testsuite, but if the main point of fedora-test-runner.sh is to run selinux's tests (in a VM), I missed the command that does so.

I thought about that, but libselinux and things that use libselinux:
- libselinux
- libsemanage
- mcstrans
- policycoreutils
- restorecond
- sandbox
All have *empty* Makefile test targets *with the exception of sandbox*.

We already run make check on the Ubuntu VM on Travis, which tests all the projects
that have defined test targets and since they don't use libselinux likely don't need a libselinux enabled host. I'm not opposed to it, just trying to trim down to things that aren't already being done.

I guess at a minimum it ensures that tests didn't break between Ubuntu and Fedora, perhaps over things like dependency versions (python version for instance) and
perhaps we pick up the sandbox tests. But the Ubuntu VM's already test with multiple (22
different build flavors) of different python, ruby, compilers and linkers and those only
take a few minutes to complete.

I'm definitely not opposed to adding it, perhaps i'm ignorant to the additional things
that might get covered and thus someone can make stronger arguments to adding it than I can.

Quoted 265 lines

Thanks,
Nicolas

Quoted 260 lines
---
 .travis.yml                      |   8 +++
 scripts/ci/README.md             |   8 +++
 scripts/ci/fedora-test-runner.sh |  89 ++++++++++++++++++++++++
 scripts/ci/travis-kvm-setup.sh   | 113 +++++++++++++++++++++++++++++++
 4 files changed, 218 insertions(+)
 create mode 100644 scripts/ci/README.md
 create mode 100755 scripts/ci/fedora-test-runner.sh
 create mode 100755 scripts/ci/travis-kvm-setup.sh
.travis.yml +8 -0
index c36e721a5e1d..63a856672f9b 100644
@@ -34,6 +34,14 @@ matrix:
       env: PYVER=python3.8 RUBYLIBVER=2.7 LINKER=gold
     - compiler: clang
       env: PYVER=python3.8 RUBYLIBVER=2.7 LINKER=bfd
+  include:
+    - compiler: gcc
+      env: TRAVIS_RUN_KVM=true
+      install:
+        - skip
+      before_script:
+        - skip
+      script: scripts/ci/travis-kvm-setup.sh
 
 # Use Travis-CI Ubuntu 18.04 Bionic Beaver, "full image" variant
 sudo: required
scripts/ci/README.md new file +8 -0
new file mode 100644
index 000000000000..04a134a438c2
@@ -0,0 +1,8 @@
+# Continuous Integration Scripts
+
+The scripts under `scripts/ci` are designed specifically
+for the Travis CI system. While nothing prevents you
+from mimicking that environment and using them locally,
+they are not applicable for general consumption. Any
+thing in this directory should never be considered as
+a stable API.
scripts/ci/fedora-test-runner.sh new file +89 -0
new file mode 100755
index 000000000000..14bcf5fc469d
@@ -0,0 +1,89 @@
+#!/usr/bin/env bash
+
+set -ev
+
+# CI Debug output if things go squirrely.
+getenforce
+id -Z
+nproc
+pwd
+
+# Turn off enforcing for the setup to prevent any weirdness from breaking
+# the CI.
+setenforce 0
+
+dnf clean all -y
+dnf install -y \
+    --allowerasing \
+    --skip-broken \
+    git \
+    audit-libs-devel \
+    bison \
+    bzip2-devel \
+    CUnit-devel \
+    diffutils \
+    flex \
+    gcc \
+    gettext \
+    glib2-devel \
+    make \
+    libcap-devel \
+    libcap-ng-devel \
+    pam-devel \
+    pcre-devel \
+    xmlto \
+    python3-devel \
+    ruby-devel \
+    swig \
+    perl-Test \
+    perl-Test-Harness \
+    perl-Test-Simple \
+    selinux-policy-devel \
+    gcc \
+    libselinux-devel \
+    net-tools \
+    netlabel_tools \
+    iptables \
+    lksctp-tools-devel \
+    attr \
+    libbpf-devel \
+    keyutils-libs-devel \
+    kernel-devel \
+    quota \
+    xfsprogs-devel \
+    libuuid-devel \
+    kernel-devel-$(uname -r) \
+    kernel-modules-$(uname -r)
+
+#
+# Move to selinux code and build
+#
+cd ~/selinux
+
+# Show HEAD commit for sanity checking
+git log -1
+
+#
+# Build and replace userspace components
+#
+# Note: You can't use parallel builds here (make -jX), you'll end up
+# with race conditions that manifest like:
+# semanage_store.lo: file not recognized: file format not recognized
+#
+make LIBDIR=/usr/lib64 SHLIBDIR=/lib64 install install-pywrap relabel
+
+#
+# Get the selinux testsuite, but don't clone it in ~/selinux, move to ~
+# first.
+#
+cd ~
+git clone --depth=1 https://github.com/SELinuxProject/selinux-testsuite.git
+cd selinux-testsuite
+
+# The testsuite must be run in enforcing mode
+setenforce 1
+
+#
+# Run the test suite
+#
+make test
scripts/ci/travis-kvm-setup.sh new file +113 -1
new file mode 100755
index 000000000000..66606e9d4a5b
@@ -0,0 +1,113 @@
+#!/usr/bin/env bash
+
+set -ev
+
+TEST_RUNNER="scripts/ci/fedora-test-runner.sh"
+
+#
+# Travis gives us 7.5GB of RAM and two cores:
+# https://docs.travis-ci.com/user/reference/overview/
+#
+MEMORY=4096
+VCPUS=2
+
+# Install these here so other builds don't have to wait on these deps to download and install
+sudo apt-get install qemu-kvm libvirt-bin virtinst bridge-utils cpu-checker libguestfs-tools
+
+sudo usermod -a -G kvm,libvirt,libvirt-qemu $USER
+
+# Verify that KVM is working, useful if Travis every changes anything.
+kvm-ok
+
+sudo systemctl enable libvirtd
+sudo systemctl start libvirtd
+
+# Set up a key so we can ssh into the VM
+ssh-keygen -N "" -f "$HOME/.ssh/id_rsa"
+
+#
+# Get the Fedora Cloud Image, It is a base image that small and ready to go, extract it and modify it with virt-sysprep
+#  - https://alt.fedoraproject.org/en/verify.html
+cd $HOME
+wget https://download.fedoraproject.org/pub/fedora/linux/releases/32/Cloud/x86_64/images/Fedora-Cloud-Base-32-1.6.x86_64.raw.xz
+
+# Verify the image
+curl https://getfedora.org/static/fedora.gpg | gpg --import
+wget https://getfedora.org/static/checksums/Fedora-Cloud-32-1.6-x86_64-CHECKSUM
+gpg --verify-files *-CHECKSUM
+sha256sum --ignore-missing -c *-CHECKSUM
+
+# Extract the image
+unxz -T0 Fedora-Cloud-Base-32-1.6.x86_64.raw.xz
+
+# Search is needed for $HOME so virt service can access the image file.
+chmod a+x $HOME
+
+#
+# Modify the virtual image to:
+#   - Enable a login, we just use root
+#   - Enable passwordless login
+#     - Force a relabel to fix labels on ssh keys
+#
+sudo virt-sysprep -a "$HOME/Fedora-Cloud-Base-32-1.6.x86_64.raw" \
+  --root-password password:123456 \
+  --hostname fedoravm \
+  --append-line '/etc/ssh/sshd_config:PermitRootLogin yes' \
+  --append-line '/etc/ssh/sshd_config:PubkeyAuthentication yes' \
+  --mkdir /root/.ssh \
+  --upload "$HOME/.ssh/id_rsa.pub:/root/.ssh/authorized_keys" \
+  --chmod '0600:/root/.ssh/authorized_keys' \
+  --run-command 'chown root:root /root/.ssh/authorized_keys' \
+  --copy-in "$TRAVIS_BUILD_DIR:/root" \
+  --network \
+  --selinux-relabel
+
+#
+# Now we create a domain by using virt-install. This not only creates the domain, but runs the VM as well
+# It should be ready to go for ssh, once ssh starts.
+#
+sudo virt-install \
+  --name fedoravm \
+  --memory $MEMORY \
+  --vcpus $VCPUS \
+  --disk "$HOME/Fedora-Cloud-Base-32-1.6.x86_64.raw" \
+  --import --noautoconsole
+
+#
+# Here comes the tricky part, we have to figure out when the VM comes up AND we need the ip address for ssh. So we
+# can check the net-dhcp leases, for our host. We have to poll, and we will poll for up 3 minutes in 6 second
+# intervals, so 30 poll attempts (0-29 inclusive). I don't know of a better way to do this.
+#
+# We have a full reboot + relabel, so first sleep gets us close
+#
+sleep 30
+for i in $(seq 0 29); do
+    echo "loop $i"
+    sleep 6s
+    # Get the leases, but tee it so it's easier to debug
+    sudo virsh net-dhcp-leases default | tee dhcp-leases.txt
+
+    # get our ipaddress
+    ipaddy=$(grep fedoravm dhcp-leases.txt | awk {'print $5'} | cut -d'/' -f 1-1)
+    if [ -n "$ipaddy" ]; then
+        # found it, we're done looking, print it for debug logs
+        echo "ipaddy: $ipaddy"
+        break
+    fi
+    # it's empty/not found, loop back and try again.
+done
+
+# Did we find it? If not die.
+if [ -z "$ipaddy" ]; then
+    echo "ipaddy zero length, exiting with error 1"
+    exit 1
+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.
+#
+ssh -tt -o StrictHostKeyChecking=no -o LogLevel=QUIET "root@$ipaddy" "/root/selinux/$TEST_RUNNER"
+
+exit 0
--

2.17.1

#20 lore raw

Re: [PATCH v2] ci: run SELinux kernel test suite

In reply to Nicolas Iooss

<snip>

Quoted 4 lines

* fedora-test-runner.sh uses ~, which is expanded to /root as it does not make sense to run this script as non-root user. In my humble opinion, using /root instead of ~ makes the script even easier to read.

I forgot to mention this in my previous email, this is the only thing I really don't
want to change. You could, in theory, configure any user to run this.

<snip>

#21 lore raw

Re: [PATCH v2] ci: run SELinux kernel test suite

Quoted 7 lines · William Roberts

<snip>

Quoted 4 lines

* fedora-test-runner.sh uses ~, which is expanded to /root as it does not make sense to run this script as non-root user. In my humble opinion, using /root instead of ~ makes the script even easier to read.

Quoted 5 lines

I forgot to mention this in my previous email, this is the only thing I really don't
want to change. You could, in theory, configure any user to run this.

<snip>

The script executes "setenforce 0", runs dnf to install packages and overwrites binaries and libraries in system directories (/usr/bin, /usr/sbin, /usr/lib64, etc.). How do you allow any user to perform these actions, without being root?

Anyway, if you do not want to hardcode /root, to could use "$HOME" instead of ~. It makes things appear less magical, in my humble opinion.

Nicolas

#22 lore raw

Re: [PATCH v2] ci: run SELinux kernel test suite

Quoted 14 lines · Nicolas Iooss
Quoted 11 lines · William Roberts

<snip>

Quoted 4 lines

* fedora-test-runner.sh uses ~, which is expanded to /root as it does not make sense to run this script as non-root user. In my humble opinion, using /root instead of ~ makes the script even easier to read.

I forgot to mention this in my previous email, this is the only thing I really don't
want to change. You could, in theory, configure any user to run this.

Quoted 6 lines
Quoted 1 line

<snip>

The script executes "setenforce 0", runs dnf to install packages and overwrites binaries and libraries in system directories (/usr/bin, /usr/sbin, /usr/lib64, etc.). How do you allow any user to perform these actions, without being root?

Its called capabilities. I could build you a box where root is neutered and cannot do anything.

Quoted 4 lines

Anyway, if you do not want to hardcode /root, to could use "$HOME" instead of ~. It makes things appear less magical, in my humble opinion.

Sure, it actually makes it consistent with the other script.

Quoted 3 lines

Nicolas

#23 lore raw

Re: [PATCH v2] ci: run SELinux kernel test suite

In reply to [email protected]

Apologies for getting back to this so late... Just some small nitpicks.

Quoted 25 lines · On Wed, May 20, 2020 at 6:34 PM <[email protected]> wrote:

From: William Roberts <[email protected]>

The current Travis CI runs the userspace tooling and libraries against policy files, but cannot test against an SELinux enabled kernel. Thus, some tests are not being done in the CI. Travis, unfortunately only provides Ubuntu images, so in order to run against a modern distro with SELinux in enforcing mode, we need to launch a KVM with something like Fedora.

This patch enables this support by launching a Fedora32 Cloud Image with the SELinux userspace library passed on from the Travis clone, it then builds and replaces the current SELinux bits on the Fedora32 image and runs the SELinux testsuite.

---
 .travis.yml                      |   8 +++
 scripts/ci/README.md             |   8 +++
 scripts/ci/fedora-test-runner.sh |  89 ++++++++++++++++++++++++
 scripts/ci/travis-kvm-setup.sh   | 113 +++++++++++++++++++++++++++++++
 4 files changed, 218 insertions(+)
 create mode 100644 scripts/ci/README.md
 create mode 100755 scripts/ci/fedora-test-runner.sh
 create mode 100755 scripts/ci/travis-kvm-setup.sh

[...]

Quoted 6 lines
scripts/ci/fedora-test-runner.sh new file +0 -0
new file mode 100755
index 000000000000..14bcf5fc469d

scripts/ci/fedora-test-runner.sh line 9

Quoted 9 lines
scripts/ci/fedora-test-runner.sh new file +9 -0
@@ -0,0 +1,89 @@
+#!/usr/bin/env bash
+
+set -ev
+
+# CI Debug output if things go squirrely.
+getenforce
+id -Z
+nproc
+pwd

I'd add also "uname -r" here to dump the running kernel version (will probably be also printed later somewhere, but better to have it also in one place with the other debug info).

Quoted 7 lines
scripts/ci/fedora-test-runner.sh new file +7 -0
+
+# Turn off enforcing for the setup to prevent any weirdness from breaking
+# the CI.
+setenforce 0
+
+dnf clean all -y
+dnf install -y \

[...]

Quoted 8 lines
scripts/ci/travis-kvm-setup.sh new file +2 -0
new file mode 100755
index 000000000000..66606e9d4a5b
@@ -0,0 +1,113 @@
+#!/usr/bin/env bash
+

scripts/ci/travis-kvm-setup.sh line 12

Quoted 10 lines
scripts/ci/travis-kvm-setup.sh new file +10 -0
+set -ev
+
+TEST_RUNNER="scripts/ci/fedora-test-runner.sh"
+
+#
+# Travis gives us 7.5GB of RAM and two cores:
+# https://docs.travis-ci.com/user/reference/overview/
+#
+MEMORY=4096
+VCPUS=2

Why not "VCPUS=$(nproc)"?

scripts/ci/travis-kvm-setup.sh line 19

Quoted 7 lines
scripts/ci/travis-kvm-setup.sh new file +7 -0
+
+# Install these here so other builds don't have to wait on these deps to download and install
+sudo apt-get install qemu-kvm libvirt-bin virtinst bridge-utils cpu-checker libguestfs-tools
+
+sudo usermod -a -G kvm,libvirt,libvirt-qemu $USER
+
+# Verify that KVM is working, useful if Travis every changes anything.

s/every/ever/

scripts/ci/travis-kvm-setup.sh line 32

Quoted 13 lines
scripts/ci/travis-kvm-setup.sh new file +13 -0
+kvm-ok
+
+sudo systemctl enable libvirtd
+sudo systemctl start libvirtd
+
+# Set up a key so we can ssh into the VM
+ssh-keygen -N "" -f "$HOME/.ssh/id_rsa"
+
+#
+# Get the Fedora Cloud Image, It is a base image that small and ready to go, extract it and modify it with virt-sysprep
+#  - https://alt.fedoraproject.org/en/verify.html
+cd $HOME
+wget https://download.fedoraproject.org/pub/fedora/linux/releases/32/Cloud/x86_64/images/Fedora-Cloud-Base-32-1.6.x86_64.raw.xz

I'd suggest extracting the Fedora release version (32) + the image version (1.6) into variables, so they can be easily bumped later.

Quoted 11 lines
scripts/ci/travis-kvm-setup.sh new file +11 -0
+
+# Verify the image
+curl https://getfedora.org/static/fedora.gpg | gpg --import
+wget https://getfedora.org/static/checksums/Fedora-Cloud-32-1.6-x86_64-CHECKSUM
+gpg --verify-files *-CHECKSUM
+sha256sum --ignore-missing -c *-CHECKSUM
+
+# Extract the image
+unxz -T0 Fedora-Cloud-Base-32-1.6.x86_64.raw.xz
+
+# Search is needed for $HOME so virt service can access the image file.

scripts/ci/travis-kvm-setup.sh line 53

Quoted 10 lines
scripts/ci/travis-kvm-setup.sh new file +10 -0
+chmod a+x $HOME
+
+#
+# Modify the virtual image to:
+#   - Enable a login, we just use root
+#   - Enable passwordless login
+#     - Force a relabel to fix labels on ssh keys
+#
+sudo virt-sysprep -a "$HOME/Fedora-Cloud-Base-32-1.6.x86_64.raw" \
+  --root-password password:123456 \

Do you need to set the password when you use an SSH key to login?

scripts/ci/travis-kvm-setup.sh line 60

Quoted 7 lines
scripts/ci/travis-kvm-setup.sh new file +7 -0
+  --hostname fedoravm \
+  --append-line '/etc/ssh/sshd_config:PermitRootLogin yes' \
+  --append-line '/etc/ssh/sshd_config:PubkeyAuthentication yes' \
+  --mkdir /root/.ssh \
+  --upload "$HOME/.ssh/id_rsa.pub:/root/.ssh/authorized_keys" \
+  --chmod '0600:/root/.ssh/authorized_keys' \
+  --run-command 'chown root:root /root/.ssh/authorized_keys' \

Could these be replaced with just "--ssh-inject root"?

Quoted 21 lines
scripts/ci/travis-kvm-setup.sh new file +21 -0
+  --copy-in "$TRAVIS_BUILD_DIR:/root" \
+  --network \
+  --selinux-relabel
+
+#
+# Now we create a domain by using virt-install. This not only creates the domain, but runs the VM as well
+# It should be ready to go for ssh, once ssh starts.
+#
+sudo virt-install \
+  --name fedoravm \
+  --memory $MEMORY \
+  --vcpus $VCPUS \
+  --disk "$HOME/Fedora-Cloud-Base-32-1.6.x86_64.raw" \
+  --import --noautoconsole
+
+#
+# Here comes the tricky part, we have to figure out when the VM comes up AND we need the ip address for ssh. So we
+# can check the net-dhcp leases, for our host. We have to poll, and we will poll for up 3 minutes in 6 second
+# intervals, so 30 poll attempts (0-29 inclusive). I don't know of a better way to do this.
+#
+# We have a full reboot + relabel, so first sleep gets us close

scripts/ci/travis-kvm-setup.sh line 91

Quoted 10 lines
scripts/ci/travis-kvm-setup.sh new file +10 -0
+#
+sleep 30
+for i in $(seq 0 29); do
+    echo "loop $i"
+    sleep 6s
+    # Get the leases, but tee it so it's easier to debug
+    sudo virsh net-dhcp-leases default | tee dhcp-leases.txt
+
+    # get our ipaddress
+    ipaddy=$(grep fedoravm dhcp-leases.txt | awk {'print $5'} | cut -d'/' -f 1-1)

Looks cleaner this way:
[...] | awk '{ print $5 }' | cut -d / -f 1)

Quoted 24 lines
scripts/ci/travis-kvm-setup.sh new file +22 -1
+    if [ -n "$ipaddy" ]; then
+        # found it, we're done looking, print it for debug logs
+        echo "ipaddy: $ipaddy"
+        break
+    fi
+    # it's empty/not found, loop back and try again.
+done
+
+# Did we find it? If not die.
+if [ -z "$ipaddy" ]; then
+    echo "ipaddy zero length, exiting with error 1"
+    exit 1
+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.
+#
+ssh -tt -o StrictHostKeyChecking=no -o LogLevel=QUIET "root@$ipaddy" "/root/selinux/$TEST_RUNNER"
+
+exit 0
--

2.17.1

Signature · 3 lines
Ondrej Mosnacek
Software Engineer, Platform Security - SELinux kernel
Red Hat, Inc.
#24 lore raw

Re: [PATCH v2] ci: run SELinux kernel test suite

Quoted 70 lines · Ondrej Mosnacek

Apologies for getting back to this so late... Just some small nitpicks.

Quoted 25 lines · On Wed, May 20, 2020 at 6:34 PM <[email protected]> wrote:

From: William Roberts <[email protected]>

The current Travis CI runs the userspace tooling and libraries against policy files, but cannot test against an SELinux enabled kernel. Thus, some tests are not being done in the CI. Travis, unfortunately only provides Ubuntu images, so in order to run against a modern distro with SELinux in enforcing mode, we need to launch a KVM with something like Fedora.

This patch enables this support by launching a Fedora32 Cloud Image with the SELinux userspace library passed on from the Travis clone, it then builds and replaces the current SELinux bits on the Fedora32 image and runs the SELinux testsuite.

---
 .travis.yml                      |   8 +++
 scripts/ci/README.md             |   8 +++
 scripts/ci/fedora-test-runner.sh |  89 ++++++++++++++++++++++++
 scripts/ci/travis-kvm-setup.sh   | 113 +++++++++++++++++++++++++++++++
 4 files changed, 218 insertions(+)
 create mode 100644 scripts/ci/README.md
 create mode 100755 scripts/ci/fedora-test-runner.sh
 create mode 100755 scripts/ci/travis-kvm-setup.sh

[...]

Quoted 6 lines
scripts/ci/fedora-test-runner.sh new file +0 -0
new file mode 100755
index 000000000000..14bcf5fc469d

scripts/ci/fedora-test-runner.sh line 9

Quoted 9 lines
scripts/ci/fedora-test-runner.sh new file +9 -0
@@ -0,0 +1,89 @@
+#!/usr/bin/env bash
+
+set -ev
+
+# CI Debug output if things go squirrely.
+getenforce
+id -Z
+nproc
+pwd

I'd add also "uname -r" here to dump the running kernel version (will probably be also printed later somewhere, but better to have it also in one place with the other debug info).

Quoted 7 lines
scripts/ci/fedora-test-runner.sh new file +7 -0
+
+# Turn off enforcing for the setup to prevent any weirdness from breaking
+# the CI.
+setenforce 0
+
+dnf clean all -y
+dnf install -y \

[...]

Quoted 12 lines
scripts/ci/travis-kvm-setup.sh new file +6 -0
new file mode 100755
index 000000000000..66606e9d4a5b
@@ -0,0 +1,113 @@
+#!/usr/bin/env bash
+
+set -ev
+
+TEST_RUNNER="scripts/ci/fedora-test-runner.sh"
+
Quoted 8 lines

scripts/ci/travis-kvm-setup.sh line 12

Quoted 6 lines
scripts/ci/travis-kvm-setup.sh new file +6 -0
+#
+# Travis gives us 7.5GB of RAM and two cores:
+# https://docs.travis-ci.com/user/reference/overview/
+#
+MEMORY=4096
+VCPUS=2

Why not "VCPUS=$(nproc)"?

+1: Initially I just had this set to what travis provides. I don't know why I didn't do that.

Quoted 10 lines

scripts/ci/travis-kvm-setup.sh line 19

Quoted 8 lines
scripts/ci/travis-kvm-setup.sh new file +7 -0
+
+# Install these here so other builds don't have to wait on these deps to download and install
+sudo apt-get install qemu-kvm libvirt-bin virtinst bridge-utils cpu-checker libguestfs-tools
+
+sudo usermod -a -G kvm,libvirt,libvirt-qemu $USER
+
+# Verify that KVM is working, useful if Travis every changes anything.

s/every/ever/

+1

Quoted 17 lines
Quoted 4 lines
scripts/ci/travis-kvm-setup.sh new file +3 -0
+kvm-ok
+
+sudo systemctl enable libvirtd

scripts/ci/travis-kvm-setup.sh line 32

Quoted 10 lines
scripts/ci/travis-kvm-setup.sh new file +10 -0
+sudo systemctl start libvirtd
+
+# Set up a key so we can ssh into the VM
+ssh-keygen -N "" -f "$HOME/.ssh/id_rsa"
+
+#
+# Get the Fedora Cloud Image, It is a base image that small and ready to go, extract it and modify it with virt-sysprep
+#  - https://alt.fedoraproject.org/en/verify.html
+cd $HOME
+wget https://download.fedoraproject.org/pub/fedora/linux/releases/32/Cloud/x86_64/images/Fedora-Cloud-Base-32-1.6.x86_64.raw.xz

I'd suggest extracting the Fedora release version (32) + the image version (1.6) into variables, so they can be easily bumped later.

Sure, I forget why I ended up not doing it this way. I remember it being late at night, and cursing for some reason.

Quoted 16 lines
Quoted 16 lines
scripts/ci/travis-kvm-setup.sh new file +15 -0
+
+# Verify the image
+curl https://getfedora.org/static/fedora.gpg | gpg --import
+wget https://getfedora.org/static/checksums/Fedora-Cloud-32-1.6-x86_64-CHECKSUM
+gpg --verify-files *-CHECKSUM
+sha256sum --ignore-missing -c *-CHECKSUM
+
+# Extract the image
+unxz -T0 Fedora-Cloud-Base-32-1.6.x86_64.raw.xz
+
+# Search is needed for $HOME so virt service can access the image file.
+chmod a+x $HOME
+
+#
+# Modify the virtual image to:
Quoted 8 lines

scripts/ci/travis-kvm-setup.sh line 53

Quoted 6 lines
scripts/ci/travis-kvm-setup.sh new file +6 -0
+#   - Enable a login, we just use root
+#   - Enable passwordless login
+#     - Force a relabel to fix labels on ssh keys
+#
+sudo virt-sysprep -a "$HOME/Fedora-Cloud-Base-32-1.6.x86_64.raw" \
+  --root-password password:123456 \

Do you need to set the password when you use an SSH key to login?

Yeah the account is disabled unless you do this. Plus it was helpful when using the scripts locally and using virsh console

Quoted 10 lines

scripts/ci/travis-kvm-setup.sh line 60

Quoted 8 lines
scripts/ci/travis-kvm-setup.sh new file +7 -0
+  --hostname fedoravm \
+  --append-line '/etc/ssh/sshd_config:PermitRootLogin yes' \
+  --append-line '/etc/ssh/sshd_config:PubkeyAuthentication yes' \
+  --mkdir /root/.ssh \
+  --upload "$HOME/.ssh/id_rsa.pub:/root/.ssh/authorized_keys" \
+  --chmod '0600:/root/.ssh/authorized_keys' \
+  --run-command 'chown root:root /root/.ssh/authorized_keys' \

Could these be replaced with just "--ssh-inject root"?

No, and I went through immense pain trying to get it to work. The reason is that the tool
will dump it under /home/root instead of /root. So it won't get picked up without some
other magic anyways.

Quoted 52 lines
Quoted 22 lines
scripts/ci/travis-kvm-setup.sh new file +21 -0
+  --copy-in "$TRAVIS_BUILD_DIR:/root" \
+  --network \
+  --selinux-relabel
+
+#
+# Now we create a domain by using virt-install. This not only creates the domain, but runs the VM as well
+# It should be ready to go for ssh, once ssh starts.
+#
+sudo virt-install \
+  --name fedoravm \
+  --memory $MEMORY \
+  --vcpus $VCPUS \
+  --disk "$HOME/Fedora-Cloud-Base-32-1.6.x86_64.raw" \
+  --import --noautoconsole
+
+#
+# Here comes the tricky part, we have to figure out when the VM comes up AND we need the ip address for ssh. So we
+# can check the net-dhcp leases, for our host. We have to poll, and we will poll for up 3 minutes in 6 second
+# intervals, so 30 poll attempts (0-29 inclusive). I don't know of a better way to do this.
+#
+# We have a full reboot + relabel, so first sleep gets us close

scripts/ci/travis-kvm-setup.sh line 91

Quoted 10 lines
scripts/ci/travis-kvm-setup.sh new file +10 -0
+#
+sleep 30
+for i in $(seq 0 29); do
+    echo "loop $i"
+    sleep 6s
+    # Get the leases, but tee it so it's easier to debug
+    sudo virsh net-dhcp-leases default | tee dhcp-leases.txt
+
+    # get our ipaddress
+    ipaddy=$(grep fedoravm dhcp-leases.txt | awk {'print $5'} | cut -d'/' -f 1-1)

Looks cleaner this way:
[...] | awk '{ print $5 }' | cut -d / -f 1)

Quoted 16 lines
scripts/ci/travis-kvm-setup.sh new file +16 -0
+    if [ -n "$ipaddy" ]; then
+        # found it, we're done looking, print it for debug logs
+        echo "ipaddy: $ipaddy"
+        break
+    fi
+    # it's empty/not found, loop back and try again.
+done
+
+# Did we find it? If not die.
+if [ -z "$ipaddy" ]; then
+    echo "ipaddy zero length, exiting with error 1"
+    exit 1
+fi
+
+#
+# Great we have a host running, ssh into it. We specify -o so
Quoted 9 lines
Quoted 8 lines
scripts/ci/travis-kvm-setup.sh new file +6 -1
+# we don't get blocked on asking to add the servers key to
+# our known_hosts.
+#
+ssh -tt -o StrictHostKeyChecking=no -o LogLevel=QUIET "root@$ipaddy" "/root/selinux/$TEST_RUNNER"
+
+exit 0
--

2.17.1

Thanks Ondrej.

Bill

maintainer
#25 lore raw
In reply to [email protected]
Quoted 3 lines · On Wed, May 20, 2020 at 12:34 PM <[email protected]> wrote:

V2:
- Added some dnf and ssh options
- fixed SE Linux to SELinux

Thanks :)

Quoted 8 lines

FYI The additional dnf commands didn't add any time really to the build, the latest build is:
- https://travis-ci.org/github/williamcroberts/selinux/jobs/689293166

Note that I squashed the patch series down from what that CI build saw, but the diff is the same.

[PATCH v2] ci: run SELinux kernel test suite

Signature · 2 lines
paul moore
www.paul-moore.com
#26 lore raw

PATCH v3 1/1 Travis CI: Run selinux-testsuite

In reply to [email protected]

V3:
- Fix shell check errors.
- Use nproc for VPCU count.
- Change ~ to $HOME.
- Fix some spelling and grammar mistakes in comments.
- Use variables for image location to make updates easier.
- Use a TRAVIS variable to control this: TRAVIS_CLOUD_IMAGE_VERSION
- Default it to Fedora version 32 Minor Version 1.16
- Test that going from 32-1.6 to 31-1.9 works:
- https://travis-ci.org/github/williamcroberts/selinux/jobs/693957154
- Note it failed in the ssh connection but it did download a different image and verify the checksum. I would just take that up as we need to change images in the future, as 33 might not have an issue.

V2:
- Added some dnf and ssh options
- fixed SE Linux to SELinux

The latest build is:
- https://travis-ci.org/github/williamcroberts/selinux/jobs/693969148

Note that I squashed the patch series down from what that CI build saw, but the diff is the same.

[PATCH v3] ci: run SELinux kernel test suite

#27 lore raw

PATCH v3 1/1 ci: run SELinux kernel test suite

From: William Roberts <[email protected]>

The current Travis CI runs the userspace tooling and libraries against policy files, but cannot test against an SELinux enabled kernel. Thus, some tests are not being done in the CI. Travis, unfortunately only provides Ubuntu images, so in order to run against a modern distro with SELinux in enforcing mode, we need to launch a KVM with something like Fedora.

This patch enables this support by launching a Fedora32 Cloud Image with the SELinux userspace library passed on from the Travis clone, it then builds and replaces the current SELinux bits on the Fedora32 image and runs the SELinux testsuite.

The cloud image run can be controlled with the TRAVIS env variable:
TRAVIS_CLOUD_IMAGE_VERSION. That variable takes the major and minor version numbers in a colon delimited string, eg: "32:1.6".

---
 .travis.yml                      |   8 ++
 scripts/ci/README.md             |   8 ++
 scripts/ci/fedora-test-runner.sh |  87 +++++++++++++++++++++
 scripts/ci/travis-kvm-setup.sh   | 125 +++++++++++++++++++++++++++++++
 4 files changed, 228 insertions(+)
 create mode 100644 scripts/ci/README.md
 create mode 100755 scripts/ci/fedora-test-runner.sh
 create mode 100755 scripts/ci/travis-kvm-setup.sh
.travis.yml +8 -0
index c36e721a5e1d..bd3c98420c24 100644
@@ -34,6 +34,14 @@ matrix:
       env: PYVER=python3.8 RUBYLIBVER=2.7 LINKER=gold
     - compiler: clang
       env: PYVER=python3.8 RUBYLIBVER=2.7 LINKER=bfd
+  include:
+    - compiler: gcc
+      env: TRAVIS_RUN_KVM=true TRAVIS_CLOUD_IMAGE_VERSION="32:1.6"
+      install:
+        - skip
+      before_script:
+        - skip
+      script: scripts/ci/travis-kvm-setup.sh
 
 # Use Travis-CI Ubuntu 18.04 Bionic Beaver, "full image" variant
 sudo: required
scripts/ci/README.md new file +8 -0
new file mode 100644
index 000000000000..04a134a438c2
@@ -0,0 +1,8 @@
+# Continuous Integration Scripts
+
+The scripts under `scripts/ci` are designed specifically
+for the Travis CI system. While nothing prevents you
+from mimicking that environment and using them locally,
+they are not applicable for general consumption. Any
+thing in this directory should never be considered as
+a stable API.
scripts/ci/fedora-test-runner.sh new file +87 -0

87 lines not on this page · raw message

scripts/ci/travis-kvm-setup.sh new file +125 -0

125 lines not on this page · raw message

Signature · 1 line
2.17.1
maintainer Acked-by on v3 1/1
#28 lore raw

Re: [PATCH v3] ci: run SELinux kernel test suite

Quoted 15 lines · On Tue, Jun 2, 2020 at 3:19 PM <[email protected]> wrote:

From: William Roberts <[email protected]>

The current Travis CI runs the userspace tooling and libraries against policy files, but cannot test against an SELinux enabled kernel. Thus, some tests are not being done in the CI. Travis, unfortunately only provides Ubuntu images, so in order to run against a modern distro with SELinux in enforcing mode, we need to launch a KVM with something like Fedora.

This patch enables this support by launching a Fedora32 Cloud Image with the SELinux userspace library passed on from the Travis clone, it then builds and replaces the current SELinux bits on the Fedora32 image and runs the SELinux testsuite.

Quoted 5 lines

The cloud image run can be controlled with the TRAVIS env variable:
TRAVIS_CLOUD_IMAGE_VERSION. That variable takes the major and minor version numbers in a colon delimited string, eg: "32:1.6".

#29 lore raw

Re: [PATCH v3] ci: run SELinux kernel test suite

In reply to [email protected]
Quoted 14 lines · On Tue, Jun 02, 2020 at 02:18:56PM -0500, [email protected] wrote:

From: William Roberts <[email protected]>

The current Travis CI runs the userspace tooling and libraries against policy files, but cannot test against an SELinux enabled kernel. Thus, some tests are not being done in the CI. Travis, unfortunately only provides Ubuntu images, so in order to run against a modern distro with SELinux in enforcing mode, we need to launch a KVM with something like Fedora.

This patch enables this support by launching a Fedora32 Cloud Image with the SELinux userspace library passed on from the Travis clone, it then builds and replaces the current SELinux bits on the Fedora32 image and runs the SELinux testsuite.

Quoted 5 lines

The cloud image run can be controlled with the TRAVIS env variable:
TRAVIS_CLOUD_IMAGE_VERSION. That variable takes the major and minor version numbers in a colon delimited string, eg: "32:1.6".

I pushed all Acked bugs to my fork's branch 3.1-rc2 and the travis jobs failed:

https://travis-ci.org/github/bachradsusi/SELinuxProject-selinux/jobs/697177370

~~~
#
# 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.
#
ssh -tt -o StrictHostKeyChecking=no -o LogLevel=QUIET "root@$ipaddy" "/root/selinux/$TEST_RUNNER"
bash: /root/selinux/scripts/ci/fedora-test-runner.sh: No such file or directory
The command "scripts/ci/travis-kvm-setup.sh" exited with 127.

Done. Your build exited with 1.
~~~

Quoted 270 lines
---
 .travis.yml                      |   8 ++
 scripts/ci/README.md             |   8 ++
 scripts/ci/fedora-test-runner.sh |  87 +++++++++++++++++++++
 scripts/ci/travis-kvm-setup.sh   | 125 +++++++++++++++++++++++++++++++
 4 files changed, 228 insertions(+)
 create mode 100644 scripts/ci/README.md
 create mode 100755 scripts/ci/fedora-test-runner.sh
 create mode 100755 scripts/ci/travis-kvm-setup.sh
.travis.yml +8 -0
index c36e721a5e1d..bd3c98420c24 100644
@@ -34,6 +34,14 @@ matrix:
       env: PYVER=python3.8 RUBYLIBVER=2.7 LINKER=gold
     - compiler: clang
       env: PYVER=python3.8 RUBYLIBVER=2.7 LINKER=bfd
+  include:
+    - compiler: gcc
+      env: TRAVIS_RUN_KVM=true TRAVIS_CLOUD_IMAGE_VERSION="32:1.6"
+      install:
+        - skip
+      before_script:
+        - skip
+      script: scripts/ci/travis-kvm-setup.sh
 
 # Use Travis-CI Ubuntu 18.04 Bionic Beaver, "full image" variant
 sudo: required
scripts/ci/README.md new file +8 -0
new file mode 100644
index 000000000000..04a134a438c2
@@ -0,0 +1,8 @@
+# Continuous Integration Scripts
+
+The scripts under `scripts/ci` are designed specifically
+for the Travis CI system. While nothing prevents you
+from mimicking that environment and using them locally,
+they are not applicable for general consumption. Any
+thing in this directory should never be considered as
+a stable API.
scripts/ci/fedora-test-runner.sh new file +87 -0
new file mode 100755
index 000000000000..0927ed5dad8f
@@ -0,0 +1,87 @@
+#!/usr/bin/env bash
+
+set -ev
+
+# CI Debug output if things go squirrely.
+getenforce
+id -Z
+nproc
+pwd
+
+# Turn off enforcing for the setup to prevent any weirdness from breaking
+# the CI.
+setenforce 0
+
+dnf clean all -y
+dnf install -y \
+    --allowerasing \
+    --skip-broken \
+    git \
+    audit-libs-devel \
+    bison \
+    bzip2-devel \
+    CUnit-devel \
+    diffutils \
+    flex \
+    gcc \
+    gettext \
+    glib2-devel \
+    make \
+    libcap-devel \
+    libcap-ng-devel \
+    pam-devel \
+    pcre-devel \
+    xmlto \
+    python3-devel \
+    ruby-devel \
+    swig \
+    perl-Test \
+    perl-Test-Harness \
+    perl-Test-Simple \
+    selinux-policy-devel \
+    gcc \
+    libselinux-devel \
+    net-tools \
+    netlabel_tools \
+    iptables \
+    lksctp-tools-devel \
+    attr \
+    libbpf-devel \
+    keyutils-libs-devel \
+    kernel-devel \
+    quota \
+    xfsprogs-devel \
+    libuuid-devel \
+    kernel-devel-"$(uname -r)" \
+    kernel-modules-"$(uname -r)"
+
+#
+# Move to selinux code and build
+#
+cd "$HOME/selinux"
+
+# Show HEAD commit for sanity checking
+git log -1
+
+#
+# Build and replace userspace components
+#
+make -j"$(nproc)" LIBDIR=/usr/lib64 SHLIBDIR=/lib64 install
+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
+# first.
+#
+cd "$HOME"
+git clone --depth=1 https://github.com/SELinuxProject/selinux-testsuite.git
+cd selinux-testsuite
+
+# The testsuite must be run in enforcing mode
+setenforce 1
+
+#
+# Run the test suite
+#
+make test
scripts/ci/travis-kvm-setup.sh new file +125 -0
new file mode 100755
index 000000000000..864dbac96a46
@@ -0,0 +1,125 @@
+#!/usr/bin/env bash
+
+set -ev
+
+TEST_RUNNER="scripts/ci/fedora-test-runner.sh"
+
+#
+# Variables for controlling the Fedora Image version and download URLs.
+#
+MAJOR_VERSION="32"
+MINOR_VERSION="1.6"
+
+BASE_URL="https://download.fedoraproject.org/pub/fedora/linux/releases"
+IMAGE_BASE_NAME="Fedora-Cloud-Base-$MAJOR_VERSION-$MINOR_VERSION.x86_64"
+IMAGE_URL="$BASE_URL/$MAJOR_VERSION/Cloud/x86_64/images/$IMAGE_BASE_NAME.raw.xz"
+CHECK_URL="$BASE_URL/$MAJOR_VERSION/Cloud/x86_64/images/Fedora-Cloud-$MAJOR_VERSION-$MINOR_VERSION-x86_64-CHECKSUM"
+GPG_URL="https://getfedora.org/static/fedora.gpg"
+
+#
+# Travis gives us 7.5GB of RAM and two cores:
+# https://docs.travis-ci.com/user/reference/overview/
+#
+MEMORY=4096
+VCPUS="$(nproc)"
+
+# Install these here so other builds don't have to wait on these deps to download and install
+sudo apt-get install qemu-kvm libvirt-bin virtinst bridge-utils cpu-checker libguestfs-tools
+
+sudo usermod -a -G kvm,libvirt,libvirt-qemu "$USER"
+
+# Verify that KVM is working, useful if Travis ever changes anything.
+kvm-ok
+
+sudo systemctl enable libvirtd
+sudo systemctl start libvirtd
+
+# Set up a key so we can ssh into the VM
+ssh-keygen -N "" -f "$HOME/.ssh/id_rsa"
+
+#
+# Get the Fedora Cloud Image, It is a base image that small and ready to go, extract it and modify it with virt-sysprep
+#  - https://alt.fedoraproject.org/en/verify.html
+cd "$HOME"
+wget "$IMAGE_URL"
+
+# Verify the image
+curl "$GPG_URL" | gpg --import
+wget "$CHECK_URL"
+gpg --verify-files ./*-CHECKSUM
+sha256sum --ignore-missing -c ./*-CHECKSUM
+
+# Extract the image
+unxz -T0 "$IMAGE_BASE_NAME.raw.xz"
+
+# Search is needed for $HOME so virt service can access the image file.
+chmod a+x "$HOME"
+
+#
+# Modify the virtual image to:
+#   - Enable a login, we just use root
+#   - Enable passwordless login
+#     - Force a relabel to fix labels on ssh keys
+#
+sudo virt-sysprep -a "$IMAGE_BASE_NAME.raw" \
+  --root-password password:123456 \
+  --hostname fedoravm \
+  --append-line '/etc/ssh/sshd_config:PermitRootLogin yes' \
+  --append-line '/etc/ssh/sshd_config:PubkeyAuthentication yes' \
+  --mkdir /root/.ssh \
+  --upload "$HOME/.ssh/id_rsa.pub:/root/.ssh/authorized_keys" \
+  --chmod '0600:/root/.ssh/authorized_keys' \
+  --run-command 'chown root:root /root/.ssh/authorized_keys' \
+  --copy-in "$TRAVIS_BUILD_DIR:/root" \
+  --network \
+  --selinux-relabel
+
+#
+# Now we create a domain by using virt-install. This not only creates the domain, but runs the VM as well
+# It should be ready to go for ssh, once ssh starts.
+#
+sudo virt-install \
+  --name fedoravm \
+  --memory $MEMORY \
+  --vcpus $VCPUS \
+  --disk "$IMAGE_BASE_NAME.raw" \
+  --import --noautoconsole
+
+#
+# Here comes the tricky part, we have to figure out when the VM comes up AND we need the ip address for ssh. So we
+# can check the net-dhcp leases, for our host. We have to poll, and we will poll for up to 3 minutes in 6 second
+# intervals, so 30 poll attempts (0-29 inclusive).
+#
+# We have a full reboot + relabel, so first sleep gets us close
+#
+sleep 30
+for i in $(seq 0 29); do
+    echo "loop $i"
+    sleep 6s
+    # Get the leases, but tee it so it's easier to debug
+    sudo virsh net-dhcp-leases default | tee dhcp-leases.txt
+
+    # get our ipaddress
+    ipaddy="$(grep fedoravm dhcp-leases.txt | awk '{print $5}' | cut -d'/' -f 1-1)"
+    if [ -n "$ipaddy" ]; then
+        # found it, we're done looking, print it for debug logs
+        echo "ipaddy: $ipaddy"
+        break
+    fi
+    # it's empty/not found, loop back and try again.
+done
+
+# Did we find it? If not die.
+if [ -z "$ipaddy" ]; then
+    echo "ipaddy zero length, exiting with error 1"
+    exit 1
+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.
+#
+ssh -tt -o StrictHostKeyChecking=no -o LogLevel=QUIET "root@$ipaddy" "/root/selinux/$TEST_RUNNER"
+
+exit 0
Signature · 1 line
2.17.1
#30 lore raw

Re: [PATCH v3] ci: run SELinux kernel test suite

Quoted 299 lines · Petr Lautrbach
Quoted 14 lines · On Tue, Jun 02, 2020 at 02:18:56PM -0500, [email protected] wrote:

From: William Roberts <[email protected]>

The current Travis CI runs the userspace tooling and libraries against policy files, but cannot test against an SELinux enabled kernel. Thus, some tests are not being done in the CI. Travis, unfortunately only provides Ubuntu images, so in order to run against a modern distro with SELinux in enforcing mode, we need to launch a KVM with something like Fedora.

This patch enables this support by launching a Fedora32 Cloud Image with the SELinux userspace library passed on from the Travis clone, it then builds and replaces the current SELinux bits on the Fedora32 image and runs the SELinux testsuite.

Quoted 5 lines

The cloud image run can be controlled with the TRAVIS env variable:
TRAVIS_CLOUD_IMAGE_VERSION. That variable takes the major and minor version numbers in a colon delimited string, eg: "32:1.6".

I pushed all Acked bugs to my fork's branch 3.1-rc2 and the travis jobs failed:

https://travis-ci.org/github/bachradsusi/SELinuxProject-selinux/jobs/697177370

~~~
#
# 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.
#
ssh -tt -o StrictHostKeyChecking=no -o LogLevel=QUIET "root@$ipaddy" "/root/selinux/$TEST_RUNNER"
bash: /root/selinux/scripts/ci/fedora-test-runner.sh: No such file or directory
The command "scripts/ci/travis-kvm-setup.sh" exited with 127.

Done. Your build exited with 1.
~~~

Quoted 259 lines
---
 .travis.yml                      |   8 ++
 scripts/ci/README.md             |   8 ++
 scripts/ci/fedora-test-runner.sh |  87 +++++++++++++++++++++
 scripts/ci/travis-kvm-setup.sh   | 125 +++++++++++++++++++++++++++++++
 4 files changed, 228 insertions(+)
 create mode 100644 scripts/ci/README.md
 create mode 100755 scripts/ci/fedora-test-runner.sh
 create mode 100755 scripts/ci/travis-kvm-setup.sh
.travis.yml +8 -0
index c36e721a5e1d..bd3c98420c24 100644
@@ -34,6 +34,14 @@ matrix:
       env: PYVER=python3.8 RUBYLIBVER=2.7 LINKER=gold
     - compiler: clang
       env: PYVER=python3.8 RUBYLIBVER=2.7 LINKER=bfd
+  include:
+    - compiler: gcc
+      env: TRAVIS_RUN_KVM=true TRAVIS_CLOUD_IMAGE_VERSION="32:1.6"
+      install:
+        - skip
+      before_script:
+        - skip
+      script: scripts/ci/travis-kvm-setup.sh
 
 # Use Travis-CI Ubuntu 18.04 Bionic Beaver, "full image" variant
 sudo: required
scripts/ci/README.md new file +8 -0
new file mode 100644
index 000000000000..04a134a438c2
@@ -0,0 +1,8 @@
+# Continuous Integration Scripts
+
+The scripts under `scripts/ci` are designed specifically
+for the Travis CI system. While nothing prevents you
+from mimicking that environment and using them locally,
+they are not applicable for general consumption. Any
+thing in this directory should never be considered as
+a stable API.
scripts/ci/fedora-test-runner.sh new file +87 -0
new file mode 100755
index 000000000000..0927ed5dad8f
@@ -0,0 +1,87 @@
+#!/usr/bin/env bash
+
+set -ev
+
+# CI Debug output if things go squirrely.
+getenforce
+id -Z
+nproc
+pwd
+
+# Turn off enforcing for the setup to prevent any weirdness from breaking
+# the CI.
+setenforce 0
+
+dnf clean all -y
+dnf install -y \
+    --allowerasing \
+    --skip-broken \
+    git \
+    audit-libs-devel \
+    bison \
+    bzip2-devel \
+    CUnit-devel \
+    diffutils \
+    flex \
+    gcc \
+    gettext \
+    glib2-devel \
+    make \
+    libcap-devel \
+    libcap-ng-devel \
+    pam-devel \
+    pcre-devel \
+    xmlto \
+    python3-devel \
+    ruby-devel \
+    swig \
+    perl-Test \
+    perl-Test-Harness \
+    perl-Test-Simple \
+    selinux-policy-devel \
+    gcc \
+    libselinux-devel \
+    net-tools \
+    netlabel_tools \
+    iptables \
+    lksctp-tools-devel \
+    attr \
+    libbpf-devel \
+    keyutils-libs-devel \
+    kernel-devel \
+    quota \
+    xfsprogs-devel \
+    libuuid-devel \
+    kernel-devel-"$(uname -r)" \
+    kernel-modules-"$(uname -r)"
+
+#
+# Move to selinux code and build
+#
+cd "$HOME/selinux"
+
+# Show HEAD commit for sanity checking
+git log -1
+
+#
+# Build and replace userspace components
+#
+make -j"$(nproc)" LIBDIR=/usr/lib64 SHLIBDIR=/lib64 install
+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
+# first.
+#
+cd "$HOME"
+git clone --depth=1 https://github.com/SELinuxProject/selinux-testsuite.git
+cd selinux-testsuite
+
+# The testsuite must be run in enforcing mode
+setenforce 1
+
+#
+# Run the test suite
+#
+make test
scripts/ci/travis-kvm-setup.sh new file +117 -0
new file mode 100755
index 000000000000..864dbac96a46
@@ -0,0 +1,125 @@
+#!/usr/bin/env bash
+
+set -ev
+
+TEST_RUNNER="scripts/ci/fedora-test-runner.sh"
+
+#
+# Variables for controlling the Fedora Image version and download URLs.
+#
+MAJOR_VERSION="32"
+MINOR_VERSION="1.6"
+
+BASE_URL="https://download.fedoraproject.org/pub/fedora/linux/releases"
+IMAGE_BASE_NAME="Fedora-Cloud-Base-$MAJOR_VERSION-$MINOR_VERSION.x86_64"
+IMAGE_URL="$BASE_URL/$MAJOR_VERSION/Cloud/x86_64/images/$IMAGE_BASE_NAME.raw.xz"
+CHECK_URL="$BASE_URL/$MAJOR_VERSION/Cloud/x86_64/images/Fedora-Cloud-$MAJOR_VERSION-$MINOR_VERSION-x86_64-CHECKSUM"
+GPG_URL="https://getfedora.org/static/fedora.gpg"
+
+#
+# Travis gives us 7.5GB of RAM and two cores:
+# https://docs.travis-ci.com/user/reference/overview/
+#
+MEMORY=4096
+VCPUS="$(nproc)"
+
+# Install these here so other builds don't have to wait on these deps to download and install
+sudo apt-get install qemu-kvm libvirt-bin virtinst bridge-utils cpu-checker libguestfs-tools
+
+sudo usermod -a -G kvm,libvirt,libvirt-qemu "$USER"
+
+# Verify that KVM is working, useful if Travis ever changes anything.
+kvm-ok
+
+sudo systemctl enable libvirtd
+sudo systemctl start libvirtd
+
+# Set up a key so we can ssh into the VM
+ssh-keygen -N "" -f "$HOME/.ssh/id_rsa"
+
+#
+# Get the Fedora Cloud Image, It is a base image that small and ready to go, extract it and modify it with virt-sysprep
+#  - https://alt.fedoraproject.org/en/verify.html
+cd "$HOME"
+wget "$IMAGE_URL"
+
+# Verify the image
+curl "$GPG_URL" | gpg --import
+wget "$CHECK_URL"
+gpg --verify-files ./*-CHECKSUM
+sha256sum --ignore-missing -c ./*-CHECKSUM
+
+# Extract the image
+unxz -T0 "$IMAGE_BASE_NAME.raw.xz"
+
+# Search is needed for $HOME so virt service can access the image file.
+chmod a+x "$HOME"
+
+#
+# Modify the virtual image to:
+#   - Enable a login, we just use root
+#   - Enable passwordless login
+#     - Force a relabel to fix labels on ssh keys
+#
+sudo virt-sysprep -a "$IMAGE_BASE_NAME.raw" \
+  --root-password password:123456 \
+  --hostname fedoravm \
+  --append-line '/etc/ssh/sshd_config:PermitRootLogin yes' \
+  --append-line '/etc/ssh/sshd_config:PubkeyAuthentication yes' \
+  --mkdir /root/.ssh \
+  --upload "$HOME/.ssh/id_rsa.pub:/root/.ssh/authorized_keys" \
+  --chmod '0600:/root/.ssh/authorized_keys' \
+  --run-command 'chown root:root /root/.ssh/authorized_keys' \
+  --copy-in "$TRAVIS_BUILD_DIR:/root" \
+  --network \
+  --selinux-relabel
+
+#
+# Now we create a domain by using virt-install. This not only creates the domain, but runs the VM as well
+# It should be ready to go for ssh, once ssh starts.
+#
+sudo virt-install \
+  --name fedoravm \
+  --memory $MEMORY \
+  --vcpus $VCPUS \
+  --disk "$IMAGE_BASE_NAME.raw" \
+  --import --noautoconsole
+
+#
+# Here comes the tricky part, we have to figure out when the VM comes up AND we need the ip address for ssh. So we
+# can check the net-dhcp leases, for our host. We have to poll, and we will poll for up to 3 minutes in 6 second
+# intervals, so 30 poll attempts (0-29 inclusive).
+#
+# We have a full reboot + relabel, so first sleep gets us close
+#
+sleep 30
+for i in $(seq 0 29); do
+    echo "loop $i"
+    sleep 6s
+    # Get the leases, but tee it so it's easier to debug
+    sudo virsh net-dhcp-leases default | tee dhcp-leases.txt
+
+    # get our ipaddress
+    ipaddy="$(grep fedoravm dhcp-leases.txt | awk '{print $5}' | cut -d'/' -f 1-1)"
+    if [ -n "$ipaddy" ]; then
+        # found it, we're done looking, print it for debug logs
+        echo "ipaddy: $ipaddy"
+        break
+    fi
+    # it's empty/not found, loop back and try again.
+done
+
+# Did we find it? If not die.
+if [ -z "$ipaddy" ]; then
+    echo "ipaddy zero length, exiting with error 1"
+    exit 1
+fi
+
Quoted 8 lines

scripts/ci/travis-kvm-setup.sh line 125

Quoted 8 lines
scripts/ci/travis-kvm-setup.sh new file +8 -0
+#
+# 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.
+#
+ssh -tt -o StrictHostKeyChecking=no -o LogLevel=QUIET "root@$ipaddy" "/root/selinux/$TEST_RUNNER"
+
+exit 0

Well that's a new one. Let me look into it, feel free to drop it from the RC if you need to. Do me a favor, could you
restart that build just to see if it reproduces again?

#31 lore raw

Re: [PATCH v3] ci: run SELinux kernel test suite

In reply to Petr Lautrbach
Quoted 35 lines · Petr Lautrbach
Quoted 14 lines · On Tue, Jun 02, 2020 at 02:18:56PM -0500, [email protected] wrote:

From: William Roberts <[email protected]>

The current Travis CI runs the userspace tooling and libraries against policy files, but cannot test against an SELinux enabled kernel. Thus, some tests are not being done in the CI. Travis, unfortunately only provides Ubuntu images, so in order to run against a modern distro with SELinux in enforcing mode, we need to launch a KVM with something like Fedora.

This patch enables this support by launching a Fedora32 Cloud Image with the SELinux userspace library passed on from the Travis clone, it then builds and replaces the current SELinux bits on the Fedora32 image and runs the SELinux testsuite.

Quoted 5 lines

The cloud image run can be controlled with the TRAVIS env variable:
TRAVIS_CLOUD_IMAGE_VERSION. That variable takes the major and minor version numbers in a colon delimited string, eg: "32:1.6".

I pushed all Acked bugs to my fork's branch 3.1-rc2 and the travis jobs failed:

https://travis-ci.org/github/bachradsusi/SELinuxProject-selinux/jobs/697177370

~~~
#
# 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.
#
ssh -tt -o StrictHostKeyChecking=no -o LogLevel=QUIET "root@$ipaddy" "/root/selinux/$TEST_RUNNER"
bash: /root/selinux/scripts/ci/fedora-test-runner.sh: No such file or directory
The command "scripts/ci/travis-kvm-setup.sh" exited with 127.
Quoted 2 lines

Done. Your build exited with 1.
~~~

That'll be because your fork is named "SELinuxProject-selinux" instead of "selinux". Or rather because the CI script hardcodes the project name of "selinux".

Signature · 3 lines
Ondrej Mosnacek
Software Engineer, Platform Security - SELinux kernel
Red Hat, Inc.
maintainer
#32 lore raw

Re: [PATCH v3] ci: run SELinux kernel test suite

In reply to Petr Lautrbach
Quoted 29 lines · Petr Lautrbach
Quoted 14 lines · On Tue, Jun 02, 2020 at 02:18:56PM -0500, [email protected] wrote:

From: William Roberts <[email protected]>

The current Travis CI runs the userspace tooling and libraries against policy files, but cannot test against an SELinux enabled kernel. Thus, some tests are not being done in the CI. Travis, unfortunately only provides Ubuntu images, so in order to run against a modern distro with SELinux in enforcing mode, we need to launch a KVM with something like Fedora.

This patch enables this support by launching a Fedora32 Cloud Image with the SELinux userspace library passed on from the Travis clone, it then builds and replaces the current SELinux bits on the Fedora32 image and runs the SELinux testsuite.

Quoted 5 lines

The cloud image run can be controlled with the TRAVIS env variable:
TRAVIS_CLOUD_IMAGE_VERSION. That variable takes the major and minor version numbers in a colon delimited string, eg: "32:1.6".

I pushed all Acked bugs to my fork's branch 3.1-rc2 and the travis jobs failed:

https://travis-ci.org/github/bachradsusi/SELinuxProject-selinux/jobs/697177370

~~~
#
# Great we have a host running, ssh into it. We specify -o so

Quoted 8 lines
# we don't get blocked on asking to add the servers key to
# our known_hosts.
#
ssh -tt -o StrictHostKeyChecking=no -o LogLevel=QUIET "root@$ipaddy" "/root/selinux/$TEST_RUNNER"
bash: /root/selinux/scripts/ci/fedora-test-runner.sh: No such file or directory
The command "scripts/ci/travis-kvm-setup.sh" exited with 127.

Done. Your build exited with 1.

Hmm..worked for me. I looked at your travis log file and it showed the culprit: your repository is named SELinuxProject-selinux rather than selinux and the script assumes it is named selinux. So the script just needs to be a little more general I guess.

#33 lore raw

Re: [PATCH v3] ci: run SELinux kernel test suite

Quoted 38 lines · Stephen Smalley
Quoted 36 lines · Petr Lautrbach
Quoted 14 lines · On Tue, Jun 02, 2020 at 02:18:56PM -0500, [email protected] wrote:

From: William Roberts <[email protected]>

The current Travis CI runs the userspace tooling and libraries against policy files, but cannot test against an SELinux enabled kernel. Thus, some tests are not being done in the CI. Travis, unfortunately only provides Ubuntu images, so in order to run against a modern distro with SELinux in enforcing mode, we need to launch a KVM with something like Fedora.

This patch enables this support by launching a Fedora32 Cloud Image with the SELinux userspace library passed on from the Travis clone, it then builds and replaces the current SELinux bits on the Fedora32 image and runs the SELinux testsuite.

Quoted 5 lines

The cloud image run can be controlled with the TRAVIS env variable:
TRAVIS_CLOUD_IMAGE_VERSION. That variable takes the major and minor version numbers in a colon delimited string, eg: "32:1.6".

I pushed all Acked bugs to my fork's branch 3.1-rc2 and the travis jobs failed:

https://travis-ci.org/github/bachradsusi/SELinuxProject-selinux/jobs/697177370

~~~
#
# 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.
#
ssh -tt -o StrictHostKeyChecking=no -o LogLevel=QUIET "root@$ipaddy" "/root/selinux/$TEST_RUNNER"
bash: /root/selinux/scripts/ci/fedora-test-runner.sh: No such file or directory
The command "scripts/ci/travis-kvm-setup.sh" exited with 127.
Quoted 6 lines
Quoted 1 line

Done. Your build exited with 1.

Hmm..worked for me. I looked at your travis log file and it showed the culprit: your repository is named SELinuxProject-selinux rather than selinux and the script assumes it is named selinux. So the script just needs to be a little more general I guess.

You guys are way faster than me, i'm still on my first cup of coffee. Let me send something that makes that a tad more general. Ill look into the travis variables.

#34 lore raw

Re: [PATCH v3] ci: run SELinux kernel test suite

Quoted 43 lines · William Roberts
Quoted 40 lines · Stephen Smalley
Quoted 37 lines · Petr Lautrbach
Quoted 14 lines · On Tue, Jun 02, 2020 at 02:18:56PM -0500, [email protected] wrote:

From: William Roberts <[email protected]>

The current Travis CI runs the userspace tooling and libraries against policy files, but cannot test against an SELinux enabled kernel. Thus, some tests are not being done in the CI. Travis, unfortunately only provides Ubuntu images, so in order to run against a modern distro with SELinux in enforcing mode, we need to launch a KVM with something like Fedora.

This patch enables this support by launching a Fedora32 Cloud Image with the SELinux userspace library passed on from the Travis clone, it then builds and replaces the current SELinux bits on the Fedora32 image and runs the SELinux testsuite.

Quoted 5 lines

The cloud image run can be controlled with the TRAVIS env variable:
TRAVIS_CLOUD_IMAGE_VERSION. That variable takes the major and minor version numbers in a colon delimited string, eg: "32:1.6".

I pushed all Acked bugs to my fork's branch 3.1-rc2 and the travis jobs failed:

https://travis-ci.org/github/bachradsusi/SELinuxProject-selinux/jobs/697177370

~~~
#
# 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.
#
ssh -tt -o StrictHostKeyChecking=no -o LogLevel=QUIET "root@$ipaddy" "/root/selinux/$TEST_RUNNER"
bash: /root/selinux/scripts/ci/fedora-test-runner.sh: No such file or directory
The command "scripts/ci/travis-kvm-setup.sh" exited with 127.

Done. Your build exited with 1.

Quoted 8 lines
Quoted 4 lines

Hmm..worked for me. I looked at your travis log file and it showed the culprit: your repository is named SELinuxProject-selinux rather than selinux and the script assumes it is named selinux. So the script just needs to be a little more general I guess.

You guys are way faster than me, i'm still on my first cup of coffee. Let me send something that makes that a tad more general. Ill look into the travis variables.

I didn't see anything that just provides the name of the project, but basename of $TRAVIS_BUILD_DIR i think will give us what we want, so I did:

scripts/ci/travis-kvm-setup.sh +0 -1
index 864dbac96a46..ceedaa6f4e27 100755
@@ -120,6 +120,7 @@ fi
 # we don't get blocked on asking to add the servers key to
 # our known_hosts.
 #
-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" "/root/$project_dir/$TEST_RUNNER"

exit 0

----

Im testing now.

#35 lore raw

PATCH 1/1 ci: dont use hardcoded project name

From: William Roberts <[email protected]>

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.

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

---
 scripts/ci/travis-kvm-setup.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
scripts/ci/travis-kvm-setup.sh +2 -1
index 864dbac96a46..ceedaa6f4e27 100755
@@ -120,6 +120,7 @@ fi
 # we don't get blocked on asking to add the servers key to
 # our known_hosts.
 #
-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" "/root/$project_dir/$TEST_RUNNER"
 
 exit 0
Signature · 1 line
2.17.1
#36 lore raw

Re: [PATCH] ci: dont use hardcoded project name

Quoted 31 lines · On Thu, Jun 11, 2020 at 09:05:57AM -0500, [email protected] wrote:

From: William Roberts <[email protected]>

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.

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

---
 scripts/ci/travis-kvm-setup.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
scripts/ci/travis-kvm-setup.sh +2 -1
index 864dbac96a46..ceedaa6f4e27 100755
@@ -120,6 +120,7 @@ fi
 # we don't get blocked on asking to add the servers key to
 # our known_hosts.
 #
-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" "/root/$project_dir/$TEST_RUNNER"
 
 exit 0
Signature · 1 line
2.17.1

Thanks!

I'm running a new job again with this fix. But I guess you need to change fedora-test-runner.sh as well. There's also hardcoded "selinux":

~~~
# Move to selinux code and build
#
cd "$HOME/selinux"
~~~

#37 lore raw

Re: [PATCH] ci: dont use hardcoded project name

Quoted 35 lines · Petr Lautrbach
Quoted 31 lines · On Thu, Jun 11, 2020 at 09:05:57AM -0500, [email protected] wrote:

From: William Roberts <[email protected]>

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.

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

---
 scripts/ci/travis-kvm-setup.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
scripts/ci/travis-kvm-setup.sh +2 -1
index 864dbac96a46..ceedaa6f4e27 100755
@@ -120,6 +120,7 @@ fi
 # we don't get blocked on asking to add the servers key to
 # our known_hosts.
 #
-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" "/root/$project_dir/$TEST_RUNNER"
 
 exit 0
Signature · 1 line
2.17.1

Thanks!

Quoted 9 lines

I'm running a new job again with this fix. But I guess you need to change fedora-test-runner.sh as well. There's also hardcoded "selinux":

~~~
# Move to selinux code and build
#
cd "$HOME/selinux"
~~~

https://travis-ci.org/github/bachradsusi/SELinuxProject-selinux/jobs/697271776

~~~
# Move to selinux code and build
#
cd "$HOME/selinux"
/root/SELinuxProject-selinux/scripts/ci/fedora-test-runner.sh: line 61: cd: /root/selinux: No such file or directory The command "scripts/ci/travis-kvm-setup.sh" exited with 1.

Done. Your build exited with 1.
~~~

#38 lore raw

Re: [PATCH] ci: dont use hardcoded project name

Quoted 56 lines · Petr Lautrbach
Quoted 35 lines · Petr Lautrbach
Quoted 29 lines · On Thu, Jun 11, 2020 at 09:05:57AM -0500, [email protected] wrote:

From: William Roberts <[email protected]>

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.

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

---
 scripts/ci/travis-kvm-setup.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
scripts/ci/travis-kvm-setup.sh +2 -2
index 864dbac96a46..ceedaa6f4e27 100755
@@ -120,6 +120,7 @@ fi
 # we don't get blocked on asking to add the servers key to
 # our known_hosts.
 #
-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" "/root/$project_dir/$TEST_RUNNER"
 
 exit 0
--
Quoted 2 lines

2.17.1

Thanks!

Quoted 9 lines

I'm running a new job again with this fix. But I guess you need to change fedora-test-runner.sh as well. There's also hardcoded "selinux":

~~~
# Move to selinux code and build
#
cd "$HOME/selinux"
~~~

https://travis-ci.org/github/bachradsusi/SELinuxProject-selinux/jobs/697271776

~~~
# Move to selinux code and build
#
cd "$HOME/selinux"
/root/SELinuxProject-selinux/scripts/ci/fedora-test-runner.sh: line 61: cd: /root/selinux: No such file or directory The command "scripts/ci/travis-kvm-setup.sh" exited with 1.

Quoted 2 lines

Done. Your build exited with 1.
~~~

You can add this diff for now, ill post a v2 patch after I confirm travis still runs.

scripts/ci/fedora-test-runner.sh +2 -1
index 0927ed5dad8f..067d7bd65906 100755
@@ -58,7 +58,8 @@ dnf install -y \
 #
 # Move to selinux code and build
 #
-cd "$HOME/selinux"
+project_dir="$(basename "$TRAVIS_BUILD_DIR")"
+cd "$HOME/$project_dir"
 
 # Show HEAD commit for sanity checking
 git log -1
@@ -71,7 +72,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 $HOME/$project_dir, move to $HOME

 # first.
 #
 cd "$HOME"
#39 lore raw

Re: [PATCH] ci: dont use hardcoded project name

Quoted 86 lines · William Roberts
Quoted 56 lines · Petr Lautrbach
Quoted 35 lines · Petr Lautrbach
Quoted 29 lines · On Thu, Jun 11, 2020 at 09:05:57AM -0500, [email protected] wrote:

From: William Roberts <[email protected]>

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.

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

---
 scripts/ci/travis-kvm-setup.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
scripts/ci/travis-kvm-setup.sh +2 -2
index 864dbac96a46..ceedaa6f4e27 100755
@@ -120,6 +120,7 @@ fi
 # we don't get blocked on asking to add the servers key to
 # our known_hosts.
 #
-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" "/root/$project_dir/$TEST_RUNNER"
 
 exit 0
--
Quoted 2 lines

2.17.1

Thanks!

Quoted 9 lines

I'm running a new job again with this fix. But I guess you need to change fedora-test-runner.sh as well. There's also hardcoded "selinux":

~~~
# Move to selinux code and build
#
cd "$HOME/selinux"
~~~

https://travis-ci.org/github/bachradsusi/SELinuxProject-selinux/jobs/697271776

~~~
# Move to selinux code and build
#
cd "$HOME/selinux"
/root/SELinuxProject-selinux/scripts/ci/fedora-test-runner.sh: line 61: cd: /root/selinux: No such file or directory The command "scripts/ci/travis-kvm-setup.sh" exited with 1.

Quoted 2 lines

Done. Your build exited with 1.
~~~

You can add this diff for now, ill post a v2 patch after I confirm travis still runs.

scripts/ci/fedora-test-runner.sh +2 -1
index 0927ed5dad8f..067d7bd65906 100755
@@ -58,7 +58,8 @@ dnf install -y \
 #
 # Move to selinux code and build
 #
-cd "$HOME/selinux"
+project_dir="$(basename "$TRAVIS_BUILD_DIR")"
+cd "$HOME/$project_dir"
 
 # Show HEAD commit for sanity checking
 git log -1
@@ -71,7 +72,7 @@ make -j"$(nproc)" LIBDIR=/usr/lib64 SHLIBDIR=/lib64

install-pywrap
make -j"$(nproc)" LIBDIR=/usr/lib64 SHLIBDIR=/lib64 relabel

#

scripts/ci/fedora-test-runner.sh +1 -1
-# 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

$HOME/$project_dir, move to $HOME

Quoted 3 lines
 # first.
 #
 cd "$HOME"

Oh darn that won't work, as the travis env variables are not propagated into the environment... let me
see if I can do that.

#40 lore raw

PATCH v2 1/1 ci: dont use hardcoded project name

From: William Roberts <[email protected]>

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

---
v2:
- Fix the KVM script project location when it's not /root/selinux.

 scripts/ci/fedora-test-runner.sh | 10 ++++++++--
 scripts/ci/travis-kvm-setup.sh   |  6 ++++--
 2 files changed, 12 insertions(+), 4 deletions(-)
scripts/ci/fedora-test-runner.sh +8 -2
index 0927ed5dad8f..569723387f6b 100755
@@ -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"
scripts/ci/travis-kvm-setup.sh +4 -2
index 864dbac96a46..8d4cfb79f7d7 100755
@@ -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
Signature · 1 line
2.17.1
Acked-by on v2 1/1
#41 lore raw

Re: [PATCH v2] ci: dont use hardcoded project name

Quoted 10 lines · On Thu, Jun 11, 2020 at 12:30:39PM -0500, [email protected] wrote:

From: William Roberts <[email protected]>

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.

Quoted 4 lines

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

Thanks!

Quoted 63 lines

---
v2:
- Fix the KVM script project location when it's not /root/selinux.

 scripts/ci/fedora-test-runner.sh | 10 ++++++++--
 scripts/ci/travis-kvm-setup.sh   |  6 ++++--
 2 files changed, 12 insertions(+), 4 deletions(-)
scripts/ci/fedora-test-runner.sh +8 -2
index 0927ed5dad8f..569723387f6b 100755
@@ -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"
scripts/ci/travis-kvm-setup.sh +4 -2
index 864dbac96a46..8d4cfb79f7d7 100755
@@ -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
Signature · 1 line
2.17.1
maintainer
#42 lore raw

Re: [PATCH v2] ci: dont use hardcoded project name

Quoted 12 lines · Petr Lautrbach
Quoted 10 lines · On Thu, Jun 11, 2020 at 12:30:39PM -0500, [email protected] wrote:

From: William Roberts <[email protected]>

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.

Quoted 6 lines
Quoted 4 lines

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

Since I saw that you have been creating and testing a 3.1-rc2 branch I have held off on merging any further patches even ones that have been acked; I'll wait until you finalize that with whatever set of patches you have picked up.

#43 lore raw

Re: [PATCH v2] ci: dont use hardcoded project name

Quoted 16 lines · Stephen Smalley
Quoted 15 lines · Petr Lautrbach
Quoted 13 lines · On Thu, Jun 11, 2020 at 12:30:39PM -0500, [email protected] wrote:

From: William Roberts <[email protected]>

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

Quoted 9 lines
Quoted 3 lines
Quoted 1 line

Since I saw that you have been creating and testing a 3.1-rc2 branch I have held off on merging any further patches even ones that have been acked; I'll wait until you finalize that with whatever set of patches you have picked up.

Thanks, I'll merge everything acked later today and create 3.1-rc2 tomorrow morning.

And I'm sorry for big delays on my side.