diff --git a/.travis.yml b/.travis.yml index 065cbb3..e5b90dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,8 @@ env: - SALT_STATE=scap.scan - SALT_VERSION=3004 matrix: - - OS_VERSION=7 SALT_PILLARROOT=$TRAVIS_BUILD_DIR/tests/pillar/test-scc - - OS_VERSION=7 SALT_PILLARROOT=$TRAVIS_BUILD_DIR/tests/pillar/test-oscap + - OS_VERSION=8 SALT_PILLARROOT=$TRAVIS_BUILD_DIR/tests/pillar/test-scc + - OS_VERSION=8 SALT_PILLARROOT=$TRAVIS_BUILD_DIR/tests/pillar/test-oscap stages: - canary @@ -35,27 +35,27 @@ before_install: - 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/centos:${OS_VERSION} tests/docker/centos${OS_VERSION} + - 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 centos-${OS_VERSION} local/centos:${OS_VERSION} init - - sudo docker exec centos-${OS_VERSION} rpm --import https://repo.saltproject.io/py3/redhat/${OS_VERSION}/x86_64/${SALT_VERSION}/SALTSTACK-GPG-KEY.pub - - sudo docker exec centos-${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 centos-${OS_VERSION} yum -y install salt-minion util-linux-ng - - sudo docker exec centos-${OS_VERSION} salt-call --versions-report + --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} yum -y install salt-minion util-linux-ng + - sudo docker exec alma-${OS_VERSION} salt-call --versions-report script: | set -e - sudo docker exec centos-${OS_VERSION} salt-call --local \ + sudo docker exec alma-${OS_VERSION} salt-call --local \ --retcode-passthrough --log-file-level debug \ --file-root=$TRAVIS_BUILD_DIR \ --pillar-root=$SALT_PILLARROOT \ state.show_sls \ $SALT_STATE - sudo docker exec centos-${OS_VERSION} salt-call --local \ + sudo docker exec alma-${OS_VERSION} salt-call --local \ --retcode-passthrough --log-file-level debug \ --file-root=$TRAVIS_BUILD_DIR \ --pillar-root=$SALT_PILLARROOT \ @@ -64,12 +64,12 @@ script: | mock=True after_failure: - - sudo docker exec centos-${OS_VERSION} salt-call --local grains.items - - sudo docker exec centos-${OS_VERSION} sh -c set - - sudo docker exec centos-${OS_VERSION} more /var/log/salt/* | cat + - sudo docker exec alma-${OS_VERSION} salt-call --local grains.items + - sudo docker exec alma-${OS_VERSION} sh -c set + - sudo docker exec alma-${OS_VERSION} more /var/log/salt/* | cat after_script: - - sudo docker stop centos-${OS_VERSION} + - sudo docker stop alma-${OS_VERSION} notifications: email: diff --git a/tests/docker/alma8/Dockerfile b/tests/docker/alma8/Dockerfile new file mode 100644 index 0000000..0b69c46 --- /dev/null +++ b/tests/docker/alma8/Dockerfile @@ -0,0 +1,3 @@ +FROM docker.io/almalinux:8 + +CMD ["/bin/bash"] diff --git a/tests/docker/centos7/Dockerfile b/tests/docker/centos7/Dockerfile deleted file mode 100644 index 1e57a53..0000000 --- a/tests/docker/centos7/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM centos:centos7 - -CMD ["/bin/bash"]