Merge remote-tracking branch 'upstream/develop' into stable

.drone.jsonnet

@@ -0,0 +1,54 @@
+local distros = [
+  { name: 'amazon', version: '1' },
+  { name: 'amazon', version: '2' },
+  //  { name: 'centos', version: '6' },
+  { name: 'centos', version: '7' },
+  { name: 'debian', version: '8' },
+  { name: 'debian', version: '9' },
+  //  { name: 'ubuntu', version: '1404' },
+  //  { name: 'ubuntu', version: '1604' },
+  { name: 'ubuntu', version: '1804' },
+];
+
+local Shellcheck() = {
+  kind: 'pipeline',
+  name: 'run-shellcheck',
+
+  steps: [
+    {
+      name: 'build',
+      image: 'koalaman/shellcheck-alpine',
+      commands: [
+        'shellcheck -s sh -f checkstyle bootstrap-salt.sh',
+      ],
+    },
+  ],
+};
+
+local Build(os, os_version) = {
+  kind: 'pipeline',
+  name: std.format('build-%s-%s', [os, os_version]),
+
+  steps: [
+    {
+      name: 'build',
+      privileged: true,
+      image: 'saltstack/drone-plugin-kitchen',
+      settings: {
+        target: std.format('%s-%s', [os, os_version]),
+        requirements: 'tests/requirements.txt',
+      },
+    },
+  ],
+  depends_on: [
+    'run-shellcheck',
+  ],
+};
+
+
+[
+  Shellcheck(),
+] + [
+  Build(distro.name, distro.version)
+  for distro in distros
+]

.drone.yml

@@ -0,0 +1,133 @@
+---
+kind: pipeline
+name: run-shellcheck
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: build
+  image: koalaman/shellcheck-alpine
+  commands:
+  - shellcheck -s sh -f checkstyle bootstrap-salt.sh
+
+---
+kind: pipeline
+name: build-amazon-1
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: build
+  image: saltstack/drone-plugin-kitchen
+  settings:
+    requirements: tests/requirements.txt
+    target: amazon-1
+  privileged: true
+
+depends_on:
+- run-shellcheck
+
+---
+kind: pipeline
+name: build-amazon-2
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: build
+  image: saltstack/drone-plugin-kitchen
+  settings:
+    requirements: tests/requirements.txt
+    target: amazon-2
+  privileged: true
+
+depends_on:
+- run-shellcheck
+
+---
+kind: pipeline
+name: build-centos-7
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: build
+  image: saltstack/drone-plugin-kitchen
+  settings:
+    requirements: tests/requirements.txt
+    target: centos-7
+  privileged: true
+
+depends_on:
+- run-shellcheck
+
+---
+kind: pipeline
+name: build-debian-8
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: build
+  image: saltstack/drone-plugin-kitchen
+  settings:
+    requirements: tests/requirements.txt
+    target: debian-8
+  privileged: true
+
+depends_on:
+- run-shellcheck
+
+---
+kind: pipeline
+name: build-debian-9
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: build
+  image: saltstack/drone-plugin-kitchen
+  settings:
+    requirements: tests/requirements.txt
+    target: debian-9
+  privileged: true
+
+depends_on:
+- run-shellcheck
+
+---
+kind: pipeline
+name: build-ubuntu-1804
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: build
+  image: saltstack/drone-plugin-kitchen
+  settings:
+    requirements: tests/requirements.txt
+    target: ubuntu-1804
+  privileged: true
+
+depends_on:
+- run-shellcheck
+
+---
+kind: signature
+hmac: 563c4cb4cefd58c08143192bd72c5a25c5d0edbe4a6d1f5f89c87d3ca2024246
+
+...

.kitchen.yml

@@ -8,6 +8,7 @@ driver:
   cap_add:
     - sys_admin
   disable_upstart: false
+  use_internal_docker_network: true
 
 provisioner:
   name: salt_solo
@@ -118,4 +119,4 @@ suites:
 verifier:
   name: shell
   remote_exec: false
-  command: pytest -v tests/integration/
+  command: pytest --cache-clear -v tests/integration/

CONTRIBUTING.md

@@ -96,7 +96,7 @@ a bug fix or feature implementation can be merged in.
 
 ### PR Tests
 
-There are several Jenkins jobs that run on each Pull Request. Most of these are
+There are several build jobs that run on each Pull Request. Most of these are
 CI jobs that set up different steps, such as setting up the job, cloning the
 repo from the PR, etc.