Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes centos7 tests and adds alma8 #76

Merged
merged 1 commit into from
Jul 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
Expand All @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions tests/docker/alma8/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM docker.io/almalinux:8

CMD ["/bin/bash"]
3 changes: 0 additions & 3 deletions tests/docker/centos7/Dockerfile

This file was deleted.