* [PATCH userspace 0/4] ci: fix and migrate the testsuite part to Testing Farm
@ 2025-01-03 10:01 Ondrej Mosnacek
2025-01-03 10:02 ` [PATCH userspace 1/4] ci: use Testing Farm for running the testsuite Ondrej Mosnacek
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Ondrej Mosnacek @ 2025-01-03 10:01 UTC (permalink / raw)
To: selinux
Since the current MacOS + Vagrant setup isn't working reliably any more
and the testsuite itself has switched its CI to TF, do the same for
userspace as well. Also fix a few other CI issues while there.
In the PR the testsuite failed to run - it seems that GitHub doesn't
want to use the secrets from neither the fork's nor the target repo's
settings in a pull request... *shrugs*
However, in my fork it passed: https://github.com/WOnder93/selinux/actions/runs/12376819131
Ondrej Mosnacek (4):
ci: use Testing Farm for running the testsuite
ci: update Python versions
ci: add missing libbz2-dev dependency
ci: fix pypy conditional
.fmf/version | 1 +
.github/workflows/run_tests.yml | 39 ++++-----
.github/workflows/tf_testsuite.yml | 17 ++++
.github/workflows/vm_testsuite.yml | 22 -----
scripts/ci/.gitignore | 1 -
scripts/ci/LICENSE | 5 --
scripts/ci/README.md | 8 --
scripts/ci/Vagrantfile | 48 -----------
scripts/ci/fedora-test-runner.sh | 100 ----------------------
scripts/ci/travis-kvm-setup.sh | 130 -----------------------------
tmt/plans.fmf | 48 +++++++++++
11 files changed, 84 insertions(+), 335 deletions(-)
create mode 100644 .fmf/version
create mode 100644 .github/workflows/tf_testsuite.yml
delete mode 100644 .github/workflows/vm_testsuite.yml
delete mode 100644 scripts/ci/.gitignore
delete mode 100644 scripts/ci/LICENSE
delete mode 100644 scripts/ci/README.md
delete mode 100644 scripts/ci/Vagrantfile
delete mode 100755 scripts/ci/fedora-test-runner.sh
delete mode 100755 scripts/ci/travis-kvm-setup.sh
create mode 100644 tmt/plans.fmf
--
2.47.1
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH userspace 1/4] ci: use Testing Farm for running the testsuite 2025-01-03 10:01 [PATCH userspace 0/4] ci: fix and migrate the testsuite part to Testing Farm Ondrej Mosnacek @ 2025-01-03 10:02 ` Ondrej Mosnacek 2025-01-15 15:38 ` James Carter 2025-01-03 10:02 ` [PATCH userspace 2/4] ci: update Python versions Ondrej Mosnacek ` (2 subsequent siblings) 3 siblings, 1 reply; 7+ messages in thread From: Ondrej Mosnacek @ 2025-01-03 10:02 UTC (permalink / raw) To: selinux Due to issues with the MacOS + Vagrant setup, selinux-testsuite has migrated its CI to Testing Farm [1][2], so let's use it for running the testsuite here, too. We can import the test definitions from the testsuite repo and just add a setup "test" at the beginning that builds and installs the userspace from git. [1] https://testing-farm.io/ [2] https://github.com/SELinuxProject/selinux-testsuite/commit/d75675eb0da2906780557ec8cd139d328c81777e Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> --- .fmf/version | 1 + .github/workflows/tf_testsuite.yml | 17 ++++ .github/workflows/vm_testsuite.yml | 22 ----- scripts/ci/.gitignore | 1 - scripts/ci/LICENSE | 5 -- scripts/ci/README.md | 8 -- scripts/ci/Vagrantfile | 48 ----------- scripts/ci/fedora-test-runner.sh | 100 ---------------------- scripts/ci/travis-kvm-setup.sh | 130 ----------------------------- tmt/plans.fmf | 48 +++++++++++ 10 files changed, 66 insertions(+), 314 deletions(-) create mode 100644 .fmf/version create mode 100644 .github/workflows/tf_testsuite.yml delete mode 100644 .github/workflows/vm_testsuite.yml delete mode 100644 scripts/ci/.gitignore delete mode 100644 scripts/ci/LICENSE delete mode 100644 scripts/ci/README.md delete mode 100644 scripts/ci/Vagrantfile delete mode 100755 scripts/ci/fedora-test-runner.sh delete mode 100755 scripts/ci/travis-kvm-setup.sh create mode 100644 tmt/plans.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.github/workflows/tf_testsuite.yml b/.github/workflows/tf_testsuite.yml new file mode 100644 index 00000000..7e3993d3 --- /dev/null +++ b/.github/workflows/tf_testsuite.yml @@ -0,0 +1,17 @@ +name: Run SELinux testsuite in Testing Farm + +on: [push, pull_request] + +jobs: + tf_testsuite: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + arch: [x86_64, aarch64] + steps: + - name: Schedule test on Testing Farm + uses: sclorg/testing-farm-as-github-action@main + with: + api_key: ${{ secrets.TESTING_FARM_API_TOKEN }} + arch: ${{ matrix.arch }} diff --git a/.github/workflows/vm_testsuite.yml b/.github/workflows/vm_testsuite.yml deleted file mode 100644 index b96d58a5..00000000 --- a/.github/workflows/vm_testsuite.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Run SELinux testsuite in a virtual machine - -on: [push, pull_request] - -jobs: - vm_testsuite: - - # Use VirtualBox+vagrant on macOS, as described in https://github.com/actions/virtual-environments/issues/433 - runs-on: macos-12 - - steps: - - uses: actions/checkout@v4 - - - name: Create Vagrant VM - run: | - cd scripts/ci - vagrant up - - - name: Run SELinux testsuite in the VM - run: | - cd scripts/ci - vagrant ssh -- ./run-selinux-test.sh diff --git a/scripts/ci/.gitignore b/scripts/ci/.gitignore deleted file mode 100644 index a977916f..00000000 --- a/scripts/ci/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.vagrant/ diff --git a/scripts/ci/LICENSE b/scripts/ci/LICENSE deleted file mode 100644 index 1f95d26c..00000000 --- a/scripts/ci/LICENSE +++ /dev/null @@ -1,5 +0,0 @@ -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/scripts/ci/README.md b/scripts/ci/README.md deleted file mode 100644 index 04a134a4..00000000 --- a/scripts/ci/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# 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. diff --git a/scripts/ci/Vagrantfile b/scripts/ci/Vagrantfile deleted file mode 100644 index f3c90b71..00000000 --- a/scripts/ci/Vagrantfile +++ /dev/null @@ -1,48 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : -# Vagrant configuration file which creates a virtual machine that can run the -# test suite using fedora-test-runner.sh, in an environment similar to the one -# used for automated continuous integration tests (GitHub Actions) -# -# To create a new virtual machine: -# -# vagrant up --provision -# -# To launch tests (for example after modifications to libsepol, libselinux... are made): -# -# vagrant rsync && echo ./run-selinux-test.sh | vagrant ssh -# -# To destroy the virtual machine (for example to start again from a clean environment): -# -# vagrant destroy - -# Create a helper script in the VM to run the testsuite as root from a clean environment -$script = <<SCRIPT -cat > /home/vagrant/run-selinux-test.sh << EOF -#/bin/sh -set -e -v - -# Run the tests -sudo /root/selinux/scripts/ci/fedora-test-runner.sh -echo 'All tests passed :)' -EOF -chmod +x /home/vagrant/run-selinux-test.sh -SCRIPT - -# All Vagrant configuration is done below. The "2" in Vagrant.configure -# configures the configuration version (we support older styles for -# backwards compatibility). Please don't change it unless you know what -# you're doing. -Vagrant.configure("2") do |config| - config.vm.box = "fedora/39-cloud-base" - config.vm.synced_folder "../..", "/root/selinux" - - config.vm.provider "virtualbox" do |v| - v.memory = 4096 - end - config.vm.provider "libvirt" do |v| - v.memory = 4096 - end - - config.vm.provision :shell, inline: $script -end diff --git a/scripts/ci/fedora-test-runner.sh b/scripts/ci/fedora-test-runner.sh deleted file mode 100755 index 331b9ec7..00000000 --- a/scripts/ci/fedora-test-runner.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash -# SPDX-License-Identifier: MIT -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 -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 \ - pcre2-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 \ - e2fsprogs \ - jfsutils \ - dosfstools \ - rdma-core-devel \ - kernel-devel-"$(uname -r)" \ - kernel-modules-"$(uname -r)" - -# -# Move to selinux code and build -# -cd "$SELINUX_DIR" - -# Show HEAD commit for sanity checking -git config --global --add safe.directory "$SELINUX_DIR" -git log --oneline -1 - -# -# Build and replace userspace components -# -make clean distclean -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 selinux git directory, move to $HOME -# first. -# -cd "$HOME" -rm -rf selinux-testsuite -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 diff --git a/scripts/ci/travis-kvm-setup.sh b/scripts/ci/travis-kvm-setup.sh deleted file mode 100755 index 997ef73f..00000000 --- a/scripts/ci/travis-kvm-setup.sh +++ /dev/null @@ -1,130 +0,0 @@ -#!/usr/bin/env bash -# SPDX-License-Identifier: MIT -set -ev - -TEST_RUNNER="scripts/ci/fedora-test-runner.sh" - -# -# Variables for controlling the Fedora Image version and download URLs. -# -if [ -z "$FEDORA_MAJOR" ] || [ -z "$FEDORA_MINOR" ]; then - echo "$0: FEDORA_MAJOR and FEDORA_MINOR must be set!" 1>&2 - exit 1 -fi - -BASE_URL="https://download.fedoraproject.org/pub/fedora/linux/releases" -IMAGE_BASE_NAME="Fedora-Cloud-Base-$FEDORA_MAJOR-$FEDORA_MINOR.x86_64" -IMAGE_URL="$BASE_URL/$FEDORA_MAJOR/Cloud/x86_64/images/$IMAGE_BASE_NAME.raw.xz" -CHECK_URL="$BASE_URL/$FEDORA_MAJOR/Cloud/x86_64/images/Fedora-Cloud-$FEDORA_MAJOR-$FEDORA_MINOR-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 update -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. Also, we need to forward the project directory -# so forks know where to go. -# -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 diff --git a/tmt/plans.fmf b/tmt/plans.fmf new file mode 100644 index 00000000..89f041f2 --- /dev/null +++ b/tmt/plans.fmf @@ -0,0 +1,48 @@ +/ci: + summary: Run the testsuite with userspace from git + # Environment for the testsuite setup + environment: + STS_ROOT_DOMAIN: unconfined_t + STS_KERNEL: latest + discover: + - how: shell + tests: + - name: /prepare-selinux-userspace + summary: Build and install SELinux userspace from git + order: 0 + duration: 10m + require: + - audit-libs-devel + - bison + - bzip2-devel + - CUnit-devel + - diffutils + - flex + - gcc + - gettext + - glib2-devel + - make + - libcap-devel + - libcap-ng-devel + - pam-devel + - pcre2-devel + - python3-devel + - python3-pip + - python3-setuptools + - python3-wheel + - swig + - xmlto + test: | + set -ex + + # Build and replace userspace components + make clean distclean + 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 + - how: fmf + url: https://github.com/SELinuxProject/selinux-testsuite + ref: main + filter: tag:-ci & tag:-nfs + execute: + how: tmt -- 2.47.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH userspace 1/4] ci: use Testing Farm for running the testsuite 2025-01-03 10:02 ` [PATCH userspace 1/4] ci: use Testing Farm for running the testsuite Ondrej Mosnacek @ 2025-01-15 15:38 ` James Carter 2025-01-16 16:04 ` Petr Lautrbach 0 siblings, 1 reply; 7+ messages in thread From: James Carter @ 2025-01-15 15:38 UTC (permalink / raw) To: Ondrej Mosnacek; +Cc: selinux On Fri, Jan 3, 2025 at 5:02 AM Ondrej Mosnacek <omosnace@redhat.com> wrote: > > Due to issues with the MacOS + Vagrant setup, selinux-testsuite has > migrated its CI to Testing Farm [1][2], so let's use it for running the > testsuite here, too. > > We can import the test definitions from the testsuite repo and just add > a setup "test" at the beginning that builds and installs the userspace > from git. > > [1] https://testing-farm.io/ > [2] https://github.com/SELinuxProject/selinux-testsuite/commit/d75675eb0da2906780557ec8cd139d328c81777e > > Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> For these four patches: Acked-by: James Carter <jwcart2@gmail.com> > --- > .fmf/version | 1 + > .github/workflows/tf_testsuite.yml | 17 ++++ > .github/workflows/vm_testsuite.yml | 22 ----- > scripts/ci/.gitignore | 1 - > scripts/ci/LICENSE | 5 -- > scripts/ci/README.md | 8 -- > scripts/ci/Vagrantfile | 48 ----------- > scripts/ci/fedora-test-runner.sh | 100 ---------------------- > scripts/ci/travis-kvm-setup.sh | 130 ----------------------------- > tmt/plans.fmf | 48 +++++++++++ > 10 files changed, 66 insertions(+), 314 deletions(-) > create mode 100644 .fmf/version > create mode 100644 .github/workflows/tf_testsuite.yml > delete mode 100644 .github/workflows/vm_testsuite.yml > delete mode 100644 scripts/ci/.gitignore > delete mode 100644 scripts/ci/LICENSE > delete mode 100644 scripts/ci/README.md > delete mode 100644 scripts/ci/Vagrantfile > delete mode 100755 scripts/ci/fedora-test-runner.sh > delete mode 100755 scripts/ci/travis-kvm-setup.sh > create mode 100644 tmt/plans.fmf > > diff --git a/.fmf/version b/.fmf/version > new file mode 100644 > index 00000000..d00491fd > --- /dev/null > +++ b/.fmf/version > @@ -0,0 +1 @@ > +1 > diff --git a/.github/workflows/tf_testsuite.yml b/.github/workflows/tf_testsuite.yml > new file mode 100644 > index 00000000..7e3993d3 > --- /dev/null > +++ b/.github/workflows/tf_testsuite.yml > @@ -0,0 +1,17 @@ > +name: Run SELinux testsuite in Testing Farm > + > +on: [push, pull_request] > + > +jobs: > + tf_testsuite: > + runs-on: ubuntu-latest > + strategy: > + fail-fast: false > + matrix: > + arch: [x86_64, aarch64] > + steps: > + - name: Schedule test on Testing Farm > + uses: sclorg/testing-farm-as-github-action@main > + with: > + api_key: ${{ secrets.TESTING_FARM_API_TOKEN }} > + arch: ${{ matrix.arch }} > diff --git a/.github/workflows/vm_testsuite.yml b/.github/workflows/vm_testsuite.yml > deleted file mode 100644 > index b96d58a5..00000000 > --- a/.github/workflows/vm_testsuite.yml > +++ /dev/null > @@ -1,22 +0,0 @@ > -name: Run SELinux testsuite in a virtual machine > - > -on: [push, pull_request] > - > -jobs: > - vm_testsuite: > - > - # Use VirtualBox+vagrant on macOS, as described in https://github.com/actions/virtual-environments/issues/433 > - runs-on: macos-12 > - > - steps: > - - uses: actions/checkout@v4 > - > - - name: Create Vagrant VM > - run: | > - cd scripts/ci > - vagrant up > - > - - name: Run SELinux testsuite in the VM > - run: | > - cd scripts/ci > - vagrant ssh -- ./run-selinux-test.sh > diff --git a/scripts/ci/.gitignore b/scripts/ci/.gitignore > deleted file mode 100644 > index a977916f..00000000 > --- a/scripts/ci/.gitignore > +++ /dev/null > @@ -1 +0,0 @@ > -.vagrant/ > diff --git a/scripts/ci/LICENSE b/scripts/ci/LICENSE > deleted file mode 100644 > index 1f95d26c..00000000 > --- a/scripts/ci/LICENSE > +++ /dev/null > @@ -1,5 +0,0 @@ > -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: > - > -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. > - > -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. > diff --git a/scripts/ci/README.md b/scripts/ci/README.md > deleted file mode 100644 > index 04a134a4..00000000 > --- a/scripts/ci/README.md > +++ /dev/null > @@ -1,8 +0,0 @@ > -# 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. > diff --git a/scripts/ci/Vagrantfile b/scripts/ci/Vagrantfile > deleted file mode 100644 > index f3c90b71..00000000 > --- a/scripts/ci/Vagrantfile > +++ /dev/null > @@ -1,48 +0,0 @@ > -# -*- mode: ruby -*- > -# vi: set ft=ruby : > -# Vagrant configuration file which creates a virtual machine that can run the > -# test suite using fedora-test-runner.sh, in an environment similar to the one > -# used for automated continuous integration tests (GitHub Actions) > -# > -# To create a new virtual machine: > -# > -# vagrant up --provision > -# > -# To launch tests (for example after modifications to libsepol, libselinux... are made): > -# > -# vagrant rsync && echo ./run-selinux-test.sh | vagrant ssh > -# > -# To destroy the virtual machine (for example to start again from a clean environment): > -# > -# vagrant destroy > - > -# Create a helper script in the VM to run the testsuite as root from a clean environment > -$script = <<SCRIPT > -cat > /home/vagrant/run-selinux-test.sh << EOF > -#/bin/sh > -set -e -v > - > -# Run the tests > -sudo /root/selinux/scripts/ci/fedora-test-runner.sh > -echo 'All tests passed :)' > -EOF > -chmod +x /home/vagrant/run-selinux-test.sh > -SCRIPT > - > -# All Vagrant configuration is done below. The "2" in Vagrant.configure > -# configures the configuration version (we support older styles for > -# backwards compatibility). Please don't change it unless you know what > -# you're doing. > -Vagrant.configure("2") do |config| > - config.vm.box = "fedora/39-cloud-base" > - config.vm.synced_folder "../..", "/root/selinux" > - > - config.vm.provider "virtualbox" do |v| > - v.memory = 4096 > - end > - config.vm.provider "libvirt" do |v| > - v.memory = 4096 > - end > - > - config.vm.provision :shell, inline: $script > -end > diff --git a/scripts/ci/fedora-test-runner.sh b/scripts/ci/fedora-test-runner.sh > deleted file mode 100755 > index 331b9ec7..00000000 > --- a/scripts/ci/fedora-test-runner.sh > +++ /dev/null > @@ -1,100 +0,0 @@ > -#!/usr/bin/env bash > -# SPDX-License-Identifier: MIT > -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 > -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 \ > - pcre2-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 \ > - e2fsprogs \ > - jfsutils \ > - dosfstools \ > - rdma-core-devel \ > - kernel-devel-"$(uname -r)" \ > - kernel-modules-"$(uname -r)" > - > -# > -# Move to selinux code and build > -# > -cd "$SELINUX_DIR" > - > -# Show HEAD commit for sanity checking > -git config --global --add safe.directory "$SELINUX_DIR" > -git log --oneline -1 > - > -# > -# Build and replace userspace components > -# > -make clean distclean > -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 selinux git directory, move to $HOME > -# first. > -# > -cd "$HOME" > -rm -rf selinux-testsuite > -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 > diff --git a/scripts/ci/travis-kvm-setup.sh b/scripts/ci/travis-kvm-setup.sh > deleted file mode 100755 > index 997ef73f..00000000 > --- a/scripts/ci/travis-kvm-setup.sh > +++ /dev/null > @@ -1,130 +0,0 @@ > -#!/usr/bin/env bash > -# SPDX-License-Identifier: MIT > -set -ev > - > -TEST_RUNNER="scripts/ci/fedora-test-runner.sh" > - > -# > -# Variables for controlling the Fedora Image version and download URLs. > -# > -if [ -z "$FEDORA_MAJOR" ] || [ -z "$FEDORA_MINOR" ]; then > - echo "$0: FEDORA_MAJOR and FEDORA_MINOR must be set!" 1>&2 > - exit 1 > -fi > - > -BASE_URL="https://download.fedoraproject.org/pub/fedora/linux/releases" > -IMAGE_BASE_NAME="Fedora-Cloud-Base-$FEDORA_MAJOR-$FEDORA_MINOR.x86_64" > -IMAGE_URL="$BASE_URL/$FEDORA_MAJOR/Cloud/x86_64/images/$IMAGE_BASE_NAME.raw.xz" > -CHECK_URL="$BASE_URL/$FEDORA_MAJOR/Cloud/x86_64/images/Fedora-Cloud-$FEDORA_MAJOR-$FEDORA_MINOR-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 update > -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. Also, we need to forward the project directory > -# so forks know where to go. > -# > -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 > diff --git a/tmt/plans.fmf b/tmt/plans.fmf > new file mode 100644 > index 00000000..89f041f2 > --- /dev/null > +++ b/tmt/plans.fmf > @@ -0,0 +1,48 @@ > +/ci: > + summary: Run the testsuite with userspace from git > + # Environment for the testsuite setup > + environment: > + STS_ROOT_DOMAIN: unconfined_t > + STS_KERNEL: latest > + discover: > + - how: shell > + tests: > + - name: /prepare-selinux-userspace > + summary: Build and install SELinux userspace from git > + order: 0 > + duration: 10m > + require: > + - audit-libs-devel > + - bison > + - bzip2-devel > + - CUnit-devel > + - diffutils > + - flex > + - gcc > + - gettext > + - glib2-devel > + - make > + - libcap-devel > + - libcap-ng-devel > + - pam-devel > + - pcre2-devel > + - python3-devel > + - python3-pip > + - python3-setuptools > + - python3-wheel > + - swig > + - xmlto > + test: | > + set -ex > + > + # Build and replace userspace components > + make clean distclean > + 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 > + - how: fmf > + url: https://github.com/SELinuxProject/selinux-testsuite > + ref: main > + filter: tag:-ci & tag:-nfs > + execute: > + how: tmt > -- > 2.47.1 > > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH userspace 1/4] ci: use Testing Farm for running the testsuite 2025-01-15 15:38 ` James Carter @ 2025-01-16 16:04 ` Petr Lautrbach 0 siblings, 0 replies; 7+ messages in thread From: Petr Lautrbach @ 2025-01-16 16:04 UTC (permalink / raw) To: James Carter, Ondrej Mosnacek, selinux James Carter <jwcart2@gmail.com> writes: > On Fri, Jan 3, 2025 at 5:02 AM Ondrej Mosnacek <omosnace@redhat.com> wrote: >> >> Due to issues with the MacOS + Vagrant setup, selinux-testsuite has >> migrated its CI to Testing Farm [1][2], so let's use it for running the >> testsuite here, too. >> >> We can import the test definitions from the testsuite repo and just add >> a setup "test" at the beginning that builds and installs the userspace >> from git. >> >> [1] https://testing-farm.io/ >> [2] https://github.com/SELinuxProject/selinux-testsuite/commit/d75675eb0da2906780557ec8cd139d328c81777e >> >> Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> > > For these four patches: > Acked-by: James Carter <jwcart2@gmail.com> Merged. Thanks! >> --- >> .fmf/version | 1 + >> .github/workflows/tf_testsuite.yml | 17 ++++ >> .github/workflows/vm_testsuite.yml | 22 ----- >> scripts/ci/.gitignore | 1 - >> scripts/ci/LICENSE | 5 -- >> scripts/ci/README.md | 8 -- >> scripts/ci/Vagrantfile | 48 ----------- >> scripts/ci/fedora-test-runner.sh | 100 ---------------------- >> scripts/ci/travis-kvm-setup.sh | 130 ----------------------------- >> tmt/plans.fmf | 48 +++++++++++ >> 10 files changed, 66 insertions(+), 314 deletions(-) >> create mode 100644 .fmf/version >> create mode 100644 .github/workflows/tf_testsuite.yml >> delete mode 100644 .github/workflows/vm_testsuite.yml >> delete mode 100644 scripts/ci/.gitignore >> delete mode 100644 scripts/ci/LICENSE >> delete mode 100644 scripts/ci/README.md >> delete mode 100644 scripts/ci/Vagrantfile >> delete mode 100755 scripts/ci/fedora-test-runner.sh >> delete mode 100755 scripts/ci/travis-kvm-setup.sh >> create mode 100644 tmt/plans.fmf >> >> diff --git a/.fmf/version b/.fmf/version >> new file mode 100644 >> index 00000000..d00491fd >> --- /dev/null >> +++ b/.fmf/version >> @@ -0,0 +1 @@ >> +1 >> diff --git a/.github/workflows/tf_testsuite.yml b/.github/workflows/tf_testsuite.yml >> new file mode 100644 >> index 00000000..7e3993d3 >> --- /dev/null >> +++ b/.github/workflows/tf_testsuite.yml >> @@ -0,0 +1,17 @@ >> +name: Run SELinux testsuite in Testing Farm >> + >> +on: [push, pull_request] >> + >> +jobs: >> + tf_testsuite: >> + runs-on: ubuntu-latest >> + strategy: >> + fail-fast: false >> + matrix: >> + arch: [x86_64, aarch64] >> + steps: >> + - name: Schedule test on Testing Farm >> + uses: sclorg/testing-farm-as-github-action@main >> + with: >> + api_key: ${{ secrets.TESTING_FARM_API_TOKEN }} >> + arch: ${{ matrix.arch }} >> diff --git a/.github/workflows/vm_testsuite.yml b/.github/workflows/vm_testsuite.yml >> deleted file mode 100644 >> index b96d58a5..00000000 >> --- a/.github/workflows/vm_testsuite.yml >> +++ /dev/null >> @@ -1,22 +0,0 @@ >> -name: Run SELinux testsuite in a virtual machine >> - >> -on: [push, pull_request] >> - >> -jobs: >> - vm_testsuite: >> - >> - # Use VirtualBox+vagrant on macOS, as described in https://github.com/actions/virtual-environments/issues/433 >> - runs-on: macos-12 >> - >> - steps: >> - - uses: actions/checkout@v4 >> - >> - - name: Create Vagrant VM >> - run: | >> - cd scripts/ci >> - vagrant up >> - >> - - name: Run SELinux testsuite in the VM >> - run: | >> - cd scripts/ci >> - vagrant ssh -- ./run-selinux-test.sh >> diff --git a/scripts/ci/.gitignore b/scripts/ci/.gitignore >> deleted file mode 100644 >> index a977916f..00000000 >> --- a/scripts/ci/.gitignore >> +++ /dev/null >> @@ -1 +0,0 @@ >> -.vagrant/ >> diff --git a/scripts/ci/LICENSE b/scripts/ci/LICENSE >> deleted file mode 100644 >> index 1f95d26c..00000000 >> --- a/scripts/ci/LICENSE >> +++ /dev/null >> @@ -1,5 +0,0 @@ >> -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: >> - >> -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. >> - >> -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. >> diff --git a/scripts/ci/README.md b/scripts/ci/README.md >> deleted file mode 100644 >> index 04a134a4..00000000 >> --- a/scripts/ci/README.md >> +++ /dev/null >> @@ -1,8 +0,0 @@ >> -# 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. >> diff --git a/scripts/ci/Vagrantfile b/scripts/ci/Vagrantfile >> deleted file mode 100644 >> index f3c90b71..00000000 >> --- a/scripts/ci/Vagrantfile >> +++ /dev/null >> @@ -1,48 +0,0 @@ >> -# -*- mode: ruby -*- >> -# vi: set ft=ruby : >> -# Vagrant configuration file which creates a virtual machine that can run the >> -# test suite using fedora-test-runner.sh, in an environment similar to the one >> -# used for automated continuous integration tests (GitHub Actions) >> -# >> -# To create a new virtual machine: >> -# >> -# vagrant up --provision >> -# >> -# To launch tests (for example after modifications to libsepol, libselinux... are made): >> -# >> -# vagrant rsync && echo ./run-selinux-test.sh | vagrant ssh >> -# >> -# To destroy the virtual machine (for example to start again from a clean environment): >> -# >> -# vagrant destroy >> - >> -# Create a helper script in the VM to run the testsuite as root from a clean environment >> -$script = <<SCRIPT >> -cat > /home/vagrant/run-selinux-test.sh << EOF >> -#/bin/sh >> -set -e -v >> - >> -# Run the tests >> -sudo /root/selinux/scripts/ci/fedora-test-runner.sh >> -echo 'All tests passed :)' >> -EOF >> -chmod +x /home/vagrant/run-selinux-test.sh >> -SCRIPT >> - >> -# All Vagrant configuration is done below. The "2" in Vagrant.configure >> -# configures the configuration version (we support older styles for >> -# backwards compatibility). Please don't change it unless you know what >> -# you're doing. >> -Vagrant.configure("2") do |config| >> - config.vm.box = "fedora/39-cloud-base" >> - config.vm.synced_folder "../..", "/root/selinux" >> - >> - config.vm.provider "virtualbox" do |v| >> - v.memory = 4096 >> - end >> - config.vm.provider "libvirt" do |v| >> - v.memory = 4096 >> - end >> - >> - config.vm.provision :shell, inline: $script >> -end >> diff --git a/scripts/ci/fedora-test-runner.sh b/scripts/ci/fedora-test-runner.sh >> deleted file mode 100755 >> index 331b9ec7..00000000 >> --- a/scripts/ci/fedora-test-runner.sh >> +++ /dev/null >> @@ -1,100 +0,0 @@ >> -#!/usr/bin/env bash >> -# SPDX-License-Identifier: MIT >> -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 >> -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 \ >> - pcre2-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 \ >> - e2fsprogs \ >> - jfsutils \ >> - dosfstools \ >> - rdma-core-devel \ >> - kernel-devel-"$(uname -r)" \ >> - kernel-modules-"$(uname -r)" >> - >> -# >> -# Move to selinux code and build >> -# >> -cd "$SELINUX_DIR" >> - >> -# Show HEAD commit for sanity checking >> -git config --global --add safe.directory "$SELINUX_DIR" >> -git log --oneline -1 >> - >> -# >> -# Build and replace userspace components >> -# >> -make clean distclean >> -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 selinux git directory, move to $HOME >> -# first. >> -# >> -cd "$HOME" >> -rm -rf selinux-testsuite >> -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 >> diff --git a/scripts/ci/travis-kvm-setup.sh b/scripts/ci/travis-kvm-setup.sh >> deleted file mode 100755 >> index 997ef73f..00000000 >> --- a/scripts/ci/travis-kvm-setup.sh >> +++ /dev/null >> @@ -1,130 +0,0 @@ >> -#!/usr/bin/env bash >> -# SPDX-License-Identifier: MIT >> -set -ev >> - >> -TEST_RUNNER="scripts/ci/fedora-test-runner.sh" >> - >> -# >> -# Variables for controlling the Fedora Image version and download URLs. >> -# >> -if [ -z "$FEDORA_MAJOR" ] || [ -z "$FEDORA_MINOR" ]; then >> - echo "$0: FEDORA_MAJOR and FEDORA_MINOR must be set!" 1>&2 >> - exit 1 >> -fi >> - >> -BASE_URL="https://download.fedoraproject.org/pub/fedora/linux/releases" >> -IMAGE_BASE_NAME="Fedora-Cloud-Base-$FEDORA_MAJOR-$FEDORA_MINOR.x86_64" >> -IMAGE_URL="$BASE_URL/$FEDORA_MAJOR/Cloud/x86_64/images/$IMAGE_BASE_NAME.raw.xz" >> -CHECK_URL="$BASE_URL/$FEDORA_MAJOR/Cloud/x86_64/images/Fedora-Cloud-$FEDORA_MAJOR-$FEDORA_MINOR-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 update >> -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. Also, we need to forward the project directory >> -# so forks know where to go. >> -# >> -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 >> diff --git a/tmt/plans.fmf b/tmt/plans.fmf >> new file mode 100644 >> index 00000000..89f041f2 >> --- /dev/null >> +++ b/tmt/plans.fmf >> @@ -0,0 +1,48 @@ >> +/ci: >> + summary: Run the testsuite with userspace from git >> + # Environment for the testsuite setup >> + environment: >> + STS_ROOT_DOMAIN: unconfined_t >> + STS_KERNEL: latest >> + discover: >> + - how: shell >> + tests: >> + - name: /prepare-selinux-userspace >> + summary: Build and install SELinux userspace from git >> + order: 0 >> + duration: 10m >> + require: >> + - audit-libs-devel >> + - bison >> + - bzip2-devel >> + - CUnit-devel >> + - diffutils >> + - flex >> + - gcc >> + - gettext >> + - glib2-devel >> + - make >> + - libcap-devel >> + - libcap-ng-devel >> + - pam-devel >> + - pcre2-devel >> + - python3-devel >> + - python3-pip >> + - python3-setuptools >> + - python3-wheel >> + - swig >> + - xmlto >> + test: | >> + set -ex >> + >> + # Build and replace userspace components >> + make clean distclean >> + 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 >> + - how: fmf >> + url: https://github.com/SELinuxProject/selinux-testsuite >> + ref: main >> + filter: tag:-ci & tag:-nfs >> + execute: >> + how: tmt >> -- >> 2.47.1 >> >> ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH userspace 2/4] ci: update Python versions 2025-01-03 10:01 [PATCH userspace 0/4] ci: fix and migrate the testsuite part to Testing Farm Ondrej Mosnacek 2025-01-03 10:02 ` [PATCH userspace 1/4] ci: use Testing Farm for running the testsuite Ondrej Mosnacek @ 2025-01-03 10:02 ` Ondrej Mosnacek 2025-01-03 10:02 ` [PATCH userspace 3/4] ci: add missing libbz2-dev dependency Ondrej Mosnacek 2025-01-03 10:02 ` [PATCH userspace 4/4] ci: fix pypy conditional Ondrej Mosnacek 3 siblings, 0 replies; 7+ messages in thread From: Ondrej Mosnacek @ 2025-01-03 10:02 UTC (permalink / raw) To: selinux Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> --- .github/workflows/run_tests.yml | 36 +++++++++++++++------------------ 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index f8b6f146..af913d63 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -10,33 +10,33 @@ jobs: matrix: compiler: [gcc, clang] python-ruby-version: - - {python: '3.12', ruby: '3.3'} - - {python: '3.12', ruby: '3.3', other: 'test-flags-override'} - - {python: '3.12', ruby: '3.3', other: 'test-debug'} - - {python: '3.12', ruby: '3.3', other: 'linker-bfd'} - - {python: '3.12', ruby: '3.3', other: 'linker-gold'} + - {python: '3.13', ruby: '3.3'} + - {python: '3.13', ruby: '3.3', other: 'test-flags-override'} + - {python: '3.13', ruby: '3.3', other: 'test-debug'} + - {python: '3.13', ruby: '3.3', other: 'linker-bfd'} + - {python: '3.13', ruby: '3.3', other: 'linker-gold'} # Test several Python versions with the latest Ruby version + - {python: '3.12', ruby: '3.3'} - {python: '3.11', ruby: '3.3'} - {python: '3.10', ruby: '3.3'} - {python: '3.9', ruby: '3.3'} - {python: '3.8', ruby: '3.3'} - - {python: '3.7', ruby: '3.3'} - {python: 'pypy3.7', ruby: '3.3'} # Test several Ruby versions with the latest Python version - - {python: '3.12', ruby: '3.2'} - - {python: '3.12', ruby: '3.1'} - - {python: '3.12', ruby: '3.0'} - - {python: '3.12', ruby: '2.7'} - - {python: '3.12', ruby: '2.6'} - - {python: '3.12', ruby: '2.5'} + - {python: '3.13', ruby: '3.2'} + - {python: '3.13', ruby: '3.1'} + - {python: '3.13', ruby: '3.0'} + - {python: '3.13', ruby: '2.7'} + - {python: '3.13', ruby: '2.6'} + - {python: '3.13', ruby: '2.5'} exclude: - compiler: clang - python-ruby-version: {python: '3.12', ruby: '3.3', other: 'linker-bfd'} + python-ruby-version: {python: '3.13', ruby: '3.3', other: 'linker-bfd'} - compiler: clang - python-ruby-version: {python: '3.12', ruby: '3.3', other: 'linker-gold'} + python-ruby-version: {python: '3.13', ruby: '3.3', other: 'linker-gold'} include: - compiler: gcc - python-ruby-version: {python: '3.12', ruby: '3.3', other: 'sanitizers'} + python-ruby-version: {python: '3.13', ruby: '3.3', other: 'sanitizers'} steps: - uses: actions/checkout@v4 @@ -70,11 +70,7 @@ jobs: swig \ xmlto - pip install flake8 - - - name: Install Python setuptools - if: matrix.python-ruby-version.python == '3.12' - run: pip install setuptools + pip install flake8 setuptools - name: Install Clang if: ${{ matrix.compiler == 'clang' }} -- 2.47.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH userspace 3/4] ci: add missing libbz2-dev dependency 2025-01-03 10:01 [PATCH userspace 0/4] ci: fix and migrate the testsuite part to Testing Farm Ondrej Mosnacek 2025-01-03 10:02 ` [PATCH userspace 1/4] ci: use Testing Farm for running the testsuite Ondrej Mosnacek 2025-01-03 10:02 ` [PATCH userspace 2/4] ci: update Python versions Ondrej Mosnacek @ 2025-01-03 10:02 ` Ondrej Mosnacek 2025-01-03 10:02 ` [PATCH userspace 4/4] ci: fix pypy conditional Ondrej Mosnacek 3 siblings, 0 replies; 7+ messages in thread From: Ondrej Mosnacek @ 2025-01-03 10:02 UTC (permalink / raw) To: selinux Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> --- .github/workflows/run_tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index af913d63..63c26210 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -61,6 +61,7 @@ jobs: gawk \ gettext \ libaudit-dev \ + libbz2-dev \ libcap-dev \ libcap-ng-dev \ libcunit1-dev \ -- 2.47.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH userspace 4/4] ci: fix pypy conditional 2025-01-03 10:01 [PATCH userspace 0/4] ci: fix and migrate the testsuite part to Testing Farm Ondrej Mosnacek ` (2 preceding siblings ...) 2025-01-03 10:02 ` [PATCH userspace 3/4] ci: add missing libbz2-dev dependency Ondrej Mosnacek @ 2025-01-03 10:02 ` Ondrej Mosnacek 3 siblings, 0 replies; 7+ messages in thread From: Ondrej Mosnacek @ 2025-01-03 10:02 UTC (permalink / raw) To: selinux The operator = doesn't do pattern matching in [[ ... ]] - operator == must be used instead. Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> --- .github/workflows/run_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 63c26210..ed60921a 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -123,7 +123,7 @@ jobs: PYTHON_SYS_PREFIX="$(python -c 'import sys;print(sys.prefix)')" echo "PKG_CONFIG_PATH=${PYTHON_SYS_PREFIX}/lib/pkgconfig" >> $GITHUB_ENV - if [[ "${{ matrix.python-ruby-version.python }}" = pypy* ]] ; then + if [[ "${{ matrix.python-ruby-version.python }}" == pypy* ]] ; then # PyPy does not provide a config file for pkg-config # libpypy-c.so is provided in bin/libpypy-c.so for PyPy and bin/libpypy3-c.so for PyPy3 echo "PYINC=-I${PYTHON_SYS_PREFIX}/include" >> $GITHUB_ENV -- 2.47.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-01-16 16:04 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2025-01-03 10:01 [PATCH userspace 0/4] ci: fix and migrate the testsuite part to Testing Farm Ondrej Mosnacek 2025-01-03 10:02 ` [PATCH userspace 1/4] ci: use Testing Farm for running the testsuite Ondrej Mosnacek 2025-01-15 15:38 ` James Carter 2025-01-16 16:04 ` Petr Lautrbach 2025-01-03 10:02 ` [PATCH userspace 2/4] ci: update Python versions Ondrej Mosnacek 2025-01-03 10:02 ` [PATCH userspace 3/4] ci: add missing libbz2-dev dependency Ondrej Mosnacek 2025-01-03 10:02 ` [PATCH userspace 4/4] ci: fix pypy conditional Ondrej Mosnacek
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.