Merge pull request #74 from ferricoxide/Issue_73

.travis.yml

@@ -1,49 +1,32 @@
-dist: focal
+dist: jammy
 language: shell
 
 env:
   global:
-    - LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
-    - SEGFAULT_SIGNALS=all
     - SALT_STATE=scap.scan
-    - SALT_VERSION=3004
+    - SALT_VERSION=3006
   matrix:
     - OS_VERSION=8 SALT_PILLARROOT=$TRAVIS_BUILD_DIR/tests/pillar/test-scc
     - OS_VERSION=8 SALT_PILLARROOT=$TRAVIS_BUILD_DIR/tests/pillar/test-oscap
+    - OS_VERSION=9 SALT_PILLARROOT=$TRAVIS_BUILD_DIR/tests/pillar/test-scc
+    - OS_VERSION=9 SALT_PILLARROOT=$TRAVIS_BUILD_DIR/tests/pillar/test-oscap
 
 stages:
   - canary
   - test
 
 if: branch = master OR type = pull_request OR tag is present
 
-jobs:
-  include:
-    - stage: canary
-    # refer to this commit for context: https://github.com/plus3it/scap-formula/commit/7d7f61b597cd6d1677dc877cbdf4c3c98a4e2d49
-      before_install: skip
-      install: skip
-      env:
-        - EL7="./scap/content/guides/disa/stig-el7-scap_1-2.xml"
-      script:
-        - if ! grep -i "centos" $EL7 > /dev/null; then echo "ERROR CentOS string not found in $EL7"; exit 1; fi
-      after_script: skip
-      after_failure: skip
-
 before_install:
   - sudo apt-get update
-  - echo 'DOCKER_OPTS="-H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock -s devicemapper"' | sudo tee /etc/default/docker > /dev/null
-  - sudo service docker restart
-  - sleep 5
   - sudo docker build -t local/alma:${OS_VERSION} tests/docker/alma${OS_VERSION}
 
 install:
   - sudo docker run --detach --privileged
       --volume="${TRAVIS_BUILD_DIR}":"${TRAVIS_BUILD_DIR}":ro
-      --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro
       --name alma-${OS_VERSION} local/alma:${OS_VERSION} init
-  - sudo docker exec alma-${OS_VERSION} rpm --import https://repo.saltproject.io/py3/redhat/${OS_VERSION}/x86_64/${SALT_VERSION}/SALTSTACK-GPG-KEY.pub
-  - sudo docker exec alma-${OS_VERSION} curl -sSL -o /etc/yum.repos.d/salt.repo https://repo.saltproject.io/py3/redhat/${OS_VERSION}/x86_64/${SALT_VERSION}.repo
+  - sudo docker exec alma-${OS_VERSION} rpm --import https://repo.saltproject.io/salt/py3/redhat/${OS_VERSION}/x86_64/${SALT_VERSION}/SALT-PROJECT-GPG-PUBKEY-2023.pub
+  - sudo docker exec alma-${OS_VERSION} curl -sSL -o /etc/yum.repos.d/salt.repo https://repo.saltproject.io/salt/py3/redhat/${OS_VERSION}/x86_64/${SALT_VERSION}.repo
   - sudo docker exec alma-${OS_VERSION} yum -y install salt-minion util-linux-ng
   - sudo docker exec alma-${OS_VERSION} salt-call --versions-report