| Message ID | 20201127141745.1579498-1-omosnace@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Ondrej Mosnáček |
| Headers | show |
| Series | [userspace] travis: run only selinux-testsuite | expand |
On Fri, Nov 27, 2020 at 3:17 PM Ondrej Mosnacek <omosnace@redhat.com> wrote: > Now that the standard testing is run on GitHub Actions, we can remove it > from .travis.yml, leaving only the selinux-testsuite sanity check, which > can't be migrated. Hopefully this will save some precious minutesfrom > the limited "plan" Travis gave us... > > Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> > --- > .travis.yml | 161 +-------------------------------- > scripts/ci/travis-kvm-setup.sh | 1 + > 2 files changed, 2 insertions(+), 160 deletions(-) My intent is to apply this patch along with Nicholas's GH actions patch. In case some issues pop up with GH actions, we can simply revert it. Thoughts?
On Fri, Nov 27, 2020 at 8:22 AM Ondrej Mosnacek <omosnace@redhat.com> wrote: > > On Fri, Nov 27, 2020 at 3:17 PM Ondrej Mosnacek <omosnace@redhat.com> wrote: > > Now that the standard testing is run on GitHub Actions, we can remove it > > from .travis.yml, leaving only the selinux-testsuite sanity check, which > > can't be migrated. Hopefully this will save some precious minutesfrom > > the limited "plan" Travis gave us... > > > > Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> > > --- > > .travis.yml | 161 +-------------------------------- > > scripts/ci/travis-kvm-setup.sh | 1 + > > 2 files changed, 2 insertions(+), 160 deletions(-) > Oh awesome you got them migrated. I am in the middle of this for my other projects and was going to check back on SE Linux, glad you took care of it. > My intent is to apply this patch along with Nicholas's GH actions > patch. In case some issues pop up with GH actions, we can simply > revert it. > > Thoughts? I'm going to assume actions are working, I didn't check that patch. But it all LGTM. Ack from me. > > -- > Ondrej Mosnacek > Software Engineer, Platform Security - SELinux kernel > Red Hat, Inc. >
On Fri, Nov 27, 2020 at 3:25 PM William Roberts <bill.c.roberts@gmail.com> wrote: > On Fri, Nov 27, 2020 at 8:22 AM Ondrej Mosnacek <omosnace@redhat.com> wrote: > > > > On Fri, Nov 27, 2020 at 3:17 PM Ondrej Mosnacek <omosnace@redhat.com> wrote: > > > Now that the standard testing is run on GitHub Actions, we can remove it > > > from .travis.yml, leaving only the selinux-testsuite sanity check, which > > > can't be migrated. Hopefully this will save some precious minutesfrom > > > the limited "plan" Travis gave us... > > > > > > Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> > > > --- > > > .travis.yml | 161 +-------------------------------- > > > scripts/ci/travis-kvm-setup.sh | 1 + > > > 2 files changed, 2 insertions(+), 160 deletions(-) > > > > Oh awesome you got them migrated. I am in the middle of this for my > other projects and was going to check > back on SE Linux, glad you took care of it. > > > My intent is to apply this patch along with Nicholas's GH actions > > patch. In case some issues pop up with GH actions, we can simply > > revert it. > > > > Thoughts? > > I'm going to assume actions are working, I didn't check that patch. > But it all LGTM. > Ack from me. Thanks! I staged both patches in a PR: https://github.com/SELinuxProject/selinux/pull/272 It seems that GH actions didn't trigger on the PR. I've seen it in another project as well, but that PR is not merged yet, so I don't know if it just happens on the first PR or if there is some problem...
On Fri, Nov 27, 2020 at 3:56 PM Ondrej Mosnacek <omosnace@redhat.com> wrote: > > On Fri, Nov 27, 2020 at 3:25 PM William Roberts > <bill.c.roberts@gmail.com> wrote: > > On Fri, Nov 27, 2020 at 8:22 AM Ondrej Mosnacek <omosnace@redhat.com> wrote: > > > > > > On Fri, Nov 27, 2020 at 3:17 PM Ondrej Mosnacek <omosnace@redhat.com> wrote: > > > > Now that the standard testing is run on GitHub Actions, we can remove it > > > > from .travis.yml, leaving only the selinux-testsuite sanity check, which > > > > can't be migrated. Hopefully this will save some precious minutesfrom > > > > the limited "plan" Travis gave us... > > > > > > > > Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> > > > > --- > > > > .travis.yml | 161 +-------------------------------- > > > > scripts/ci/travis-kvm-setup.sh | 1 + > > > > 2 files changed, 2 insertions(+), 160 deletions(-) > > > > > > > Oh awesome you got them migrated. I am in the middle of this for my > > other projects and was going to check > > back on SE Linux, glad you took care of it. > > > > > My intent is to apply this patch along with Nicholas's GH actions > > > patch. In case some issues pop up with GH actions, we can simply > > > revert it. > > > > > > Thoughts? > > > > I'm going to assume actions are working, I didn't check that patch. > > But it all LGTM. > > Ack from me. > > Thanks! I staged both patches in a PR: > https://github.com/SELinuxProject/selinux/pull/272 > > It seems that GH actions didn't trigger on the PR. I've seen it in > another project as well, but that PR is not merged yet, so I don't > know if it just happens on the first PR or if there is some problem... Hi, When I pushed these commits to my repository, it triggered the actions (https://github.com/fishilico/selinux/actions/runs/390210020), so I merged the Pull Request, which triggered https://github.com/SELinuxProject/selinux/actions/runs/390222348 . So this "just works" :) Thanks, Nicolas
On Sun, Nov 29, 2020 at 12:26 PM Nicolas Iooss <nicolas.iooss@m4x.org> wrote: > > On Fri, Nov 27, 2020 at 3:56 PM Ondrej Mosnacek <omosnace@redhat.com> wrote: > > > > On Fri, Nov 27, 2020 at 3:25 PM William Roberts > > <bill.c.roberts@gmail.com> wrote: > > > On Fri, Nov 27, 2020 at 8:22 AM Ondrej Mosnacek <omosnace@redhat.com> wrote: > > > > > > > > On Fri, Nov 27, 2020 at 3:17 PM Ondrej Mosnacek <omosnace@redhat.com> wrote: > > > > > Now that the standard testing is run on GitHub Actions, we can remove it > > > > > from .travis.yml, leaving only the selinux-testsuite sanity check, which > > > > > can't be migrated. Hopefully this will save some precious minutesfrom > > > > > the limited "plan" Travis gave us... > > > > > > > > > > Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> > > > > > --- > > > > > .travis.yml | 161 +-------------------------------- > > > > > scripts/ci/travis-kvm-setup.sh | 1 + > > > > > 2 files changed, 2 insertions(+), 160 deletions(-) > > > > > > > > > > Oh awesome you got them migrated. I am in the middle of this for my > > > other projects and was going to check > > > back on SE Linux, glad you took care of it. > > > > > > > My intent is to apply this patch along with Nicholas's GH actions > > > > patch. In case some issues pop up with GH actions, we can simply > > > > revert it. > > > > > > > > Thoughts? > > > > > > I'm going to assume actions are working, I didn't check that patch. > > > But it all LGTM. > > > Ack from me. > > > > Thanks! I staged both patches in a PR: > > https://github.com/SELinuxProject/selinux/pull/272 > > > > It seems that GH actions didn't trigger on the PR. I've seen it in > > another project as well, but that PR is not merged yet, so I don't > > know if it just happens on the first PR or if there is some problem... > > Hi, > When I pushed these commits to my repository, it triggered the actions > (https://github.com/fishilico/selinux/actions/runs/390210020), so I > merged the Pull Request, which triggered > https://github.com/SELinuxProject/selinux/actions/runs/390222348 . So > this "just works" :) > > Thanks, > Nicolas Awesome, glad y'all sorted it out, I was going to look today. All my other projects the triggering for github actions builds just worked. Thanks!
diff --git a/.travis.yml b/.travis.yml index 6c0f6241..1c2c7f33 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,171 +1,12 @@ # Define the building environment language: c -matrix: - fast_finish: true - -compiler: - - clang - - gcc - -env: - matrix: - # Test the last version of Python and Ruby together, with some linkers - - PYVER=python3.8 RUBYLIBVER=2.7 - - PYVER=python3.8 RUBYLIBVER=2.7 TEST_FLAGS_OVERRIDE=1 - - PYVER=python3.8 RUBYLIBVER=2.7 TEST_DEBUG=1 - - PYVER=python3.8 RUBYLIBVER=2.7 LINKER=gold - - PYVER=python3.8 RUBYLIBVER=2.7 LINKER=bfd - - # Test several Python versions (https://docs.travis-ci.com/user/languages/python/#python-versions) - - PYVER=python3.5 RUBYLIBVER=2.7 - - PYVER=python3.6 RUBYLIBVER=2.7 - - PYVER=python3.7 RUBYLIBVER=2.7 - - PYVER=pypy3.6-7.2.0 RUBYLIBVER=2.7 - - # Test several Ruby versions (http://rubies.travis-ci.org/) - - PYVER=python3.8 RUBYLIBVER=2.6 - - PYVER=python3.8 RUBYLIBVER=2.5.1 - - PYVER=python3.8 RUBYLIBVER=2.4 - -matrix: - exclude: - - compiler: clang - 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 FEDORA_MAJOR=33 FEDORA_MINOR=1.2 - 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 dist: bionic -# Install SELinux userspace utilities dependencies -addons: - apt: - packages: - - bison - - flex - - gawk - - gettext - - libaudit-dev - - libbz2-dev - - libcap-dev - - libcap-ng-dev # This package is not whitelisted for the container infrastructure (https://github.com/travis-ci/apt-package-whitelist/issues/1096) - - libcunit1-dev - - libglib2.0-dev - - libpcre3-dev - - patch - - python3-dev - - python-dev - - swig - - xmlto - -install: - # Download and install refpolicy headers for sepolgen tests - - curl --location --retry 10 -o "$TRAVIS_BUILD_DIR/refpolicy.tar.bz2" https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 - - tar -C "$TRAVIS_BUILD_DIR" -xvjf "$TRAVIS_BUILD_DIR/refpolicy.tar.bz2" - # Make refpolicy Makefile use the new toolchain when building modules - - sed -e "s,^PREFIX :=.*,PREFIX := \$(DESTDIR)/usr," -i "$TRAVIS_BUILD_DIR/refpolicy/support/Makefile.devel" - - sudo make -j$(nproc) -C "$TRAVIS_BUILD_DIR/refpolicy" install-headers - - sudo rm -rf "$TRAVIS_BUILD_DIR/refpolicy.tar.bz2" "$TRAVIS_BUILD_DIR/refpolicy" - - sudo mkdir -p /etc/selinux - - echo 'SELINUXTYPE=refpolicy' | sudo tee /etc/selinux/config - - echo 'SELINUX_DEVEL_PATH = /usr/share/selinux/refpolicy' | sudo tee /etc/selinux/sepolgen.conf - - # Make sepolgen tests work without really installing anything in the real root (doing this would conflict with Ubuntu packages) - - sed -e "s,\"\(/usr/bin/[cs]\),\"$TRAVIS_BUILD_DIR/installdir\1," -i python/sepolgen/src/sepolgen/module.py - - # Download the required python version if it is not installed - - VIRTUAL_ENV="$HOME/virtualenv/$PYVER" - - if ! [ -d "$VIRTUAL_ENV" ] ; then - curl --retry 10 -o python.tar.bz2 "https://s3.amazonaws.com/travis-python-archives/binaries/ubuntu/18.04/x86_64/${PYVER/python/python-}.tar.bz2" && - sudo tar xjf python.tar.bz2 --directory / && - rm python.tar.bz2 ; - fi - - # Install flake8 for the given python version - - $VIRTUAL_ENV/bin/pip install flake8 - -before_script: - # Build and install in a temporary directory to run tests - - export DESTDIR="$TRAVIS_BUILD_DIR/installdir" - - # Configure the variables for Python parts - - export VIRTUAL_ENV="$HOME/virtualenv/$PYVER" - - export PYTHON="$VIRTUAL_ENV/bin/python" - # Use the header files in /opt/python/... for Python because the virtualenvs do not provide Python.h - - export PKG_CONFIG_PATH="/opt/python/$($PYTHON -c 'import sys;print("%d.%d.%d" % sys.version_info[:3])')/lib/pkgconfig" - # 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 - - if echo "$PYVER" | grep -q pypy ; then - export PYINC=-I$($PYTHON -c 'import sys;print(sys.prefix)')/include ; - export PYLIBS="$($PYTHON -c 'import sys;print("-L%s/bin -l%s" % (sys.prefix, "pypy-c" if sys.version_info < (3,) else "pypy3-c"))')" ; - fi - - # Find the Ruby executable with version $RUBYLIBVER - - rvm reinstall ruby-$RUBYLIBVER --binary - - export RUBY="$(ls -d -1 "$HOME/.rvm/rubies/ruby-$RUBYLIBVER"*/bin/ruby | head -n 1)" - - # Set the linker in $CC so that it gets used everywhere - - if [ -n "$LINKER" ]; then CC="$CC -fuse-ld=$LINKER" ; fi - - # Show variables and versions (to help debugging) - - echo "$CC" ; $CC --version - - echo "$PYTHON" ; $PYTHON --version - - echo "$RUBY" ; $RUBY --version - - # If TEST_FLAGS_OVERRIDE is defined, test that overriding CFLAGS, LDFLAGS and other variables works fine - - if [ -n "$TEST_FLAGS_OVERRIDE" ]; then EXPLICIT_MAKE_VARS="CFLAGS=-I$DESTDIR/usr/include LDFLAGS=-L$DESTDIR/usr/lib LDLIBS= CPPFLAGS=" ; fi - # If TEST_DEBUG is defined, test that debug build works fine - - if [ -n "$TEST_DEBUG" ]; then EXPLICIT_MAKE_VARS="$EXPLICIT_MAKE_VARS DEBUG=1" ; fi - script: - # Start by installing everything into $DESTDIR - - make -j$(nproc) install $EXPLICIT_MAKE_VARS -k - - make -j$(nproc) install-pywrap $EXPLICIT_MAKE_VARS -k - - make -j$(nproc) install-rubywrap $EXPLICIT_MAKE_VARS -k - - # Now that everything is installed, run "make all" to build everything which may have not been built - - make -j$(nproc) all $EXPLICIT_MAKE_VARS -k - - # Set up environment variables for the tests - - . ./scripts/env_use_destdir - - # Show variables (to help debugging issues) - - echo "$LD_LIBRARY_PATH" - - echo "$PATH" - - echo "$PYTHONPATH" - - echo "$RUBYLIB" - - # Run tests - - make test $EXPLICIT_MAKE_VARS - - # Test Python and Ruby wrappers - - $PYTHON -c 'import selinux;import selinux.audit2why;import semanage;print(selinux.is_selinux_enabled())' - - $RUBY -e 'require "selinux";require "semanage";puts Selinux::is_selinux_enabled()' - - # Run Python linter - - PATH="$VIRTUAL_ENV/bin:$PATH" ./scripts/run-flake8 - - # Remove every installed files - - rm -rf "$DESTDIR" - - # Test that "git status" looks clean, or print a clear error message - - |- - git status --short | sed -n 's/^??/error: missing .gitignore entry for/p' | (! grep '^') - - # Clean up everything and show which file would be added to "make clean" - - make clean distclean $EXPLICIT_MAKE_VARS - - |- - git ls-files --ignored --others --exclude-standard | sed 's/^/error: "make clean distclean" did not remove /' | (! grep '^') + - FEDORA_MAJOR=33 FEDORA_MINOR=1.2 scripts/ci/travis-kvm-setup.sh # Do not spam by email so long as the build succeeds notifications: diff --git a/scripts/ci/travis-kvm-setup.sh b/scripts/ci/travis-kvm-setup.sh index 756fab82..997ef73f 100755 --- a/scripts/ci/travis-kvm-setup.sh +++ b/scripts/ci/travis-kvm-setup.sh @@ -26,6 +26,7 @@ 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"
Now that the standard testing is run on GitHub Actions, we can remove it from .travis.yml, leaving only the selinux-testsuite sanity check, which can't be migrated. Hopefully this will save some precious minutesfrom the limited "plan" Travis gave us... Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> --- .travis.yml | 161 +-------------------------------- scripts/ci/travis-kvm-setup.sh | 1 + 2 files changed, 2 insertions(+), 160 deletions(-)