Merge pull request #20 from lorengordon/moar-test

.travis.yml

@@ -1,15 +1,13 @@
 language: python
-sudo: required
+
 env:
   global:
     - LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
     - SEGFAULT_SIGNALS=all
     - SALT_PILLARROOT=$TRAVIS_BUILD_DIR/tests/pillar/test-nessus-agent
-    - SALT_REPO_URL=https://archive.repo.saltstack.com/yum/redhat/7/x86_64/2019.2.repo
+    - SALT_REPO_URL=https://repo.saltproject.io/py3/redhat/7/x86_64/3003.repo
   matrix:
     - OS_VERSION=7 SALT_STATE=nessus-agent
-    - OS_VERSION=7 SALT_STATE=nessus-agent.elx
-    - OS_VERSION=7 SALT_STATE=nessus-agent.elx.configure
 
 services:
   - docker
@@ -38,16 +36,18 @@ install:
       --file-root=$TRAVIS_BUILD_DIR
       --pillar-root=$SALT_PILLARROOT
       saltutil.sync_all
+  # create the path the salt.file.find looks for
+  - sudo docker exec centos-${OS_VERSION} mkdir -p /opt/nessus_agent/var/nessus/
 
 script:
   - sudo docker exec centos-${OS_VERSION} salt-call --local
-      --retcode-passthrough --log-file-level debug
+      --retcode-passthrough --log-file /var/log/salt/minion --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
-      --retcode-passthrough --log-file-level debug
+      $SALT_STATE &&
+    sudo docker exec centos-${OS_VERSION} salt-call --local
+      --retcode-passthrough --log-file /var/log/salt/minion --log-file-level debug
       --file-root=$TRAVIS_BUILD_DIR
       --pillar-root=$SALT_PILLARROOT
       state.sls
@@ -57,7 +57,7 @@ script:
 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 centos-${OS_VERSION} cat /var/log/salt/minion
 
 after_script:
   - sudo docker stop centos-${OS_VERSION}

appveyor.yml

@@ -4,7 +4,7 @@ environment:
   global:
     SALT_FILEROOT: '%APPVEYOR_BUILD_FOLDER%'
     SALT_STATE: nessus-agent
-    SALT_URL: 'https://repo.saltstack.com/windows/Salt-Minion-2016.11.8-AMD64-Setup.exe'
+    SALT_URL: 'https://repo.saltproject.io/windows/Salt-Minion-3003-Py3-AMD64-Setup.exe'
   matrix:
     - SALT_PILLARROOT: '%APPVEYOR_BUILD_FOLDER%\tests\pillar\test-windows-main'