fix(script): fix some travis tests

noelmcloughlin · noelmcloughlin · commit 63cfb1e388b4 · 2020-05-11T00:07:07.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -60,15 +60,15 @@ jobs:
     # the `platforms` defined in `kitchen.yml`
     - env: INSTANCE=default-debian-10-master-py3
     # - env: INSTANCE=default-ubuntu-1804-master-py3
-    - env: INSTANCE=default-centos-8-master-py3
-    - env: INSTANCE=default-fedora-31-master-py3
-    - env: INSTANCE=default-opensuse-leap-151-master-py3
+    - env: INSTANCE=archive-centos-8-master-py3
+    - env: INSTANCE=archive-fedora-31-master-py3
+    - env: INSTANCE=archive-opensuse-leap-151-master-py3
     # - env: INSTANCE=default-amazonlinux-2-master-py3
     # - env: INSTANCE=default-debian-10-3000-2-py3
     # - env: INSTANCE=default-debian-9-3000-2-py3
     # - env: INSTANCE=default-ubuntu-1804-3000-2-py3
     # - env: INSTANCE=default-centos-8-3000-2-py3
-    # - env: INSTANCE=default-centos-7-3000-2-py3
+    - env: INSTANCE=default-centos-7-3000-2-py3
     # - env: INSTANCE=default-fedora-31-3000-2-py3
     # - env: INSTANCE=default-opensuse-leap-151-3000-2-py3
     # - env: INSTANCE=default-amazonlinux-2-3000-2-py3
@@ -86,7 +86,7 @@ jobs:
     # - env: INSTANCE=default-amazonlinux-2-2019-2-py3
     # - env: INSTANCE=default-centos-6-2019-2-py2
     # - env: INSTANCE=default-amazonlinux-1-2019-2-py2
-    # - env: INSTANCE=default-arch-base-latest-2019-2-py2
+    - env: INSTANCE=archive-arch-base-latest-2019-2-py2
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'
diff --git a/kitchen.yml b/kitchen.yml
@@ -147,6 +147,7 @@ suites:
       state_top:
         base:
           '*':
+            - mongodb.clean
             - mongodb
       pillars:
         top.sls:
@@ -158,3 +159,20 @@ suites:
     verifier:
       inspec_tests:
         - path: test/integration/default
+  - name: archive
+    provisioner:
+      state_top:
+        base:
+          '*':
+            - mongodb.clean
+            - mongodb
+      pillars:
+        top.sls:
+          base:
+            '*':
+              - mongodb
+      pillars_from_files:
+        mongodb.sls: test/salt/pillar/archive.sls
+    verifier:
+      inspec_tests:
+        - path: test/integration/archive
diff --git a/test/integration/archive/README.md b/test/integration/archive/README.md
@@ -0,0 +1,50 @@
+# InSpec Profile: `archive`
+
+This shows the implementation of the `archive` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md).
+
+## Verify a profile
+
+InSpec ships with built-in features to verify a profile structure.
+
+```bash
+$ inspec check archive
+Summary
+-------
+Location: archive
+Profile: profile
+Controls: 4
+Timestamp: 2019-06-24T23:09:01+00:00
+Valid: true
+
+Errors
+------
+
+Warnings
+--------
+```
+
+## Execute a profile
+
+To run all **supported** controls on a local machine use `inspec exec /path/to/profile`.
+
+```bash
+$ inspec exec archive
+..
+
+Finished in 0.0025 seconds (files took 0.12449 seconds to load)
+8 examples, 0 failures
+```
+
+## Execute a specific control from a profile
+
+To run one control from the profile use `inspec exec /path/to/profile --controls name`.
+
+```bash
+$ inspec exec archive --controls package
+.
+
+Finished in 0.0025 seconds (files took 0.12449 seconds to load)
+1 examples, 0 failures
+```
+
+See an [example control here](https://github.com/inspec/inspec/blob/master/examples/profile/controls/example.rb).
diff --git a/test/integration/archive/controls/archive_spec.rb b/test/integration/archive/controls/archive_spec.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+control 'mongodb package' do
+  title 'should be installed'
+end
diff --git a/test/integration/archive/inspec.yml b/test/integration/archive/inspec.yml
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+name: archive
+title: mongodb formula
+maintainer: SaltStack Formulas
+license: Apache-2.0
+summary: Verify that the mongodb formula is setup and configured correctly
+supports:
+  - platform-name: debian
+  - platform-name: ubuntu
+  - platform-name: centos
+  - platform-name: fedora
+  - platform-name: opensuse
+  - platform-name: suse
+  - platform-name: freebsd
+  - platform-name: amazon
+  - platform-name: arch
diff --git a/test/integration/archive/testinfra/test_default.py b/test/integration/archive/testinfra/test_default.py
@@ -0,0 +1,6 @@
+import testinfra
+
+def test_service_is_running_and_enabled(host):
+    mongodb = host.service('mongod')
+    assert mongodb.is_running
+    assert mongodb.is_enabled
diff --git a/test/salt/pillar/archive.sls b/test/salt/pillar/archive.sls
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+mongodb:
+  robo3t:
+    version: 1.2.1
+    # yamllint disable-line rule:line-length
+    source_hash: sha512=ead2c4847dc1cd4024f60f34a142af6c6818f90a37b5ae075c8b65414ee8ca8074355446c9e264094f776f7798bfba37a7c7018f94d0bec109715061ab3a57c3
+  compass:
+    version: 1.17.0
+  server:
+    package: mongodb-org
+    version: 4.2
+    use_repo: false
+    use_archive: true
+  bic:
+    version: 2.7.0
+    use_repo: false
+    use_archive: true
diff --git a/test/salt/pillar/default.sls b/test/salt/pillar/default.sls
@@ -3,28 +3,11 @@
 ---
 mongodb:
   robo3t:
-    ######## install from archive file
     version: 1.2.1
     # yamllint disable-line rule:line-length
     source_hash: sha512=ead2c4847dc1cd4024f60f34a142af6c6818f90a37b5ae075c8b65414ee8ca8074355446c9e264094f776f7798bfba37a7c7018f94d0bec109715061ab3a57c3
-
   compass:
-    ######## install from archive file
     version: 1.17.0
-
-  system:
-    userhome: /home
-    use_firewalld: false
-    use_selinux: false
-    pidpath: /var/run/mongodb
-    deps:
-      - curl
-      - openssl
-  dl:
-    interval: 60
-    retries: 2
-    tmpdir: /tmp/mongodbtmp
-
   server:
     package: mongodb-org
     version: 4.2
@@ -33,124 +16,7 @@ mongodb:
       # `keyid` for version `4.2` (Debian-based)
       keyid: E162F504A20CDF15827F718D4B7C549A058F8B6B
     use_archive: false
-    use_schema: false
-    disable_transparent_hugepages: true
-    binpath: /usr  # could be /usr/local/mongodb when use_archive=true
-    user: mongodb
-    group: mongodb
-    mongod:
-      service: mongod
-      shortcut: false
-      package: mongodb-org-server
-      conf_path: /etc/mongod.conf
-      conf:
-        systemLog:
-          logAppend: false
-          destination: file
-          path: /var/log/mongodb/mongod.log
-        storage:
-          dbPath: /var/lib/mongodb/mongod
-          journal:
-            enabled: true
-        replication:
-          replSetName: "rs1"
-        sharding:
-          clusterRole: shardsvr
-        net:
-          bindIp: '{{ grains.ipv4[-1] or grains.ipv6[-1] }}'
-          port: 27018
-        processManagement:
-          timeZoneInfo: /usr/share/zoneinfo
-          fork: true
-          pidFilePath: /var/run/mongodb/mongod.pid
-      systemd:
-        file: /usr/lib/systemd/system/mongod.service
-        conf:
-          Type: forking
-          LimitFSIZE: infinity
-          LimitCPU: infinity
-          LimitAS: infinity
-          LimitNOFILE: 64000
-          LimitNPROC: 64000
-          LimitMEMLOCK: infinity
-          TasksMax: infinity
-          TasksAccounting: false
-
-    mongos:
-      service: mongos
-      shortcut: false
-      package: mongodb-org-mongos
-      conf_path: /etc/mongos.conf
-      conf:
-        systemLog:
-          destination: file
-          path: /var/log/mongodb/mongos.log
-        processManagement:
-          timeZoneInfo: /usr/share/zoneinfo
-          fork: true
-          pidFilePath: /var/run/mongodb/mongos.pid
-        net:
-          bindIp: '{{ grains.ipv4[-1] or grains.ipv6[-1] }}'
-          port: 28017
-        sharding:
-          configDB: 'rs1/{{ grains.ipv4[-1] or grains.ipv6[-1] }}:27018'
-      systemd:
-        file: /usr/lib/systemd/system/mongos.service
-        conf:
-          Type: simple
-          LimitFSIZE: infinity
-          LimitCPU: infinity
-          LimitAS: infinity
-          LimitNOFILE: 64000
-          LimitNPROC: 64000
-          LimitMEMLOCK: infinity
-          TasksMax: infinity
-          TasksAccounting: false
-    shell:
-      package: mongodb-org-shell
-      mongorc: /etc/mongorc.js
-    tools:
-      package: mongodb-org-tools
-
   bic:
-    ######### install from archive file
     version: 2.7.0
     use_repo: false
     use_archive: true
-    use_schema: true
-    binpath: /usr/local/bic
-    user: mongodb
-    group: mongodb
-    mongosqld:
-      service: mongosqld
-      shortcut: false
-      conf_path: /etc/mongosqld.conf
-      conf:
-        systemLog:
-          logAppend: true
-          path: /var/log/mongodb/mongosqld.log
-        schema:
-          path: /etc/mongosqld/schema
-        security:
-          enabled: false
-        mongodb:
-          net:
-            uri: '{{ grains.ipv4[-1] or grains.ipv6[-1] }}:27018'
-            # auth:
-            #  username: root
-            #  password: changeme
-        net:
-          bindIp: '{{ grains.ipv4[-1] or grains.ipv6[-1] }}'
-          port: 3307
-      systemd:
-        file: /usr/lib/systemd/system/mongosqld.service
-        conf:
-          Type: simple
-          LimitFSIZE: infinity
-          LimitCPU: infinity
-          LimitAS: infinity
-          LimitNOFILE: 64000
-          LimitNPROC: 64000
-          LimitMEMLOCK: infinity
-          TasksMax: infinity
-          TasksAccounting: false
