From 23ce10e3caa92eaf9b2bbc4b2a67838780e22dda Mon Sep 17 00:00:00 2001
From: Erick Banks <erick@puppetlabs.com>
Date: Tue, 10 Sep 2019 12:56:19 -0700
Subject: [PATCH] (FM-8394) add debian 10 testing

---
 metadata.json                                    |  3 ++-
 provision.yaml                                   |  2 +-
 spec/acceptance/nodesets/centos-7-x64.yml        | 10 ----------
 spec/acceptance/nodesets/debian-8-x64.yml        | 10 ----------
 spec/acceptance/nodesets/default.yml             | 10 ----------
 spec/acceptance/nodesets/docker/centos-7.yml     | 12 ------------
 spec/acceptance/nodesets/docker/debian-8.yml     | 11 -----------
 spec/acceptance/nodesets/docker/ubuntu-14.04.yml | 12 ------------
 spec/classes/apt_spec.rb                         |  6 ++++++
 9 files changed, 9 insertions(+), 67 deletions(-)
 delete mode 100644 spec/acceptance/nodesets/centos-7-x64.yml
 delete mode 100644 spec/acceptance/nodesets/debian-8-x64.yml
 delete mode 100644 spec/acceptance/nodesets/default.yml
 delete mode 100644 spec/acceptance/nodesets/docker/centos-7.yml
 delete mode 100644 spec/acceptance/nodesets/docker/debian-8.yml
 delete mode 100644 spec/acceptance/nodesets/docker/ubuntu-14.04.yml

diff --git a/metadata.json b/metadata.json
index 80c45a91de..aa9a831dc9 100644
--- a/metadata.json
+++ b/metadata.json
@@ -22,7 +22,8 @@
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "8",
-        "9"
+        "9",
+        "10"
       ]
     },
     {
diff --git a/provision.yaml b/provision.yaml
index e20c29d96d..ce1608d2d9 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -10,4 +10,4 @@ waffle_deb:
   images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/ubuntu14.04', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04']
 release_checks:
   provisioner: vmpooler
-  images: ['debian-8-x86_64', 'debian-9-x86_64',  'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64']
+  images: ['debian-8-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64']
diff --git a/spec/acceptance/nodesets/centos-7-x64.yml b/spec/acceptance/nodesets/centos-7-x64.yml
deleted file mode 100644
index 5eebdefbfa..0000000000
--- a/spec/acceptance/nodesets/centos-7-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-7-x64:
-    roles:
-      - agent
-      - default
-    platform: el-7-x86_64
-    hypervisor: vagrant
-    box: puppetlabs/centos-7.2-64-nocm
-CONFIG:
-  type: foss
diff --git a/spec/acceptance/nodesets/debian-8-x64.yml b/spec/acceptance/nodesets/debian-8-x64.yml
deleted file mode 100644
index fef6e63ca5..0000000000
--- a/spec/acceptance/nodesets/debian-8-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  debian-8-x64:
-    roles:
-      - agent
-      - default
-    platform: debian-8-amd64
-    hypervisor: vagrant
-    box: puppetlabs/debian-8.2-64-nocm
-CONFIG:
-  type: foss
diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index dba339c46a..0000000000
--- a/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-1404-x64:
-    roles:
-      - agent
-      - default
-    platform: ubuntu-14.04-amd64
-    hypervisor: vagrant
-    box: puppetlabs/ubuntu-14.04-64-nocm
-CONFIG:
-  type: foss
diff --git a/spec/acceptance/nodesets/docker/centos-7.yml b/spec/acceptance/nodesets/docker/centos-7.yml
deleted file mode 100644
index a3333aac53..0000000000
--- a/spec/acceptance/nodesets/docker/centos-7.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-7-x64:
-    platform: el-7-x86_64
-    hypervisor: docker
-    image: centos:7
-    docker_preserve_image: true
-    docker_cmd: '["/usr/sbin/init"]'
-    # install various tools required to get the image up to usable levels
-    docker_image_commands:
-      - 'yum install -y crontabs tar wget openssl sysvinit-tools iproute which initscripts'
-CONFIG:
-  trace_limit: 200
diff --git a/spec/acceptance/nodesets/docker/debian-8.yml b/spec/acceptance/nodesets/docker/debian-8.yml
deleted file mode 100644
index df5c31944f..0000000000
--- a/spec/acceptance/nodesets/docker/debian-8.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  debian-8-x64:
-    platform: debian-8-amd64
-    hypervisor: docker
-    image: debian:8
-    docker_preserve_image: true
-    docker_cmd: '["/sbin/init"]'
-    docker_image_commands:
-      - 'apt-get update && apt-get install -y net-tools wget locales strace lsof && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen'
-CONFIG:
-  trace_limit: 200
diff --git a/spec/acceptance/nodesets/docker/ubuntu-14.04.yml b/spec/acceptance/nodesets/docker/ubuntu-14.04.yml
deleted file mode 100644
index b1efa58390..0000000000
--- a/spec/acceptance/nodesets/docker/ubuntu-14.04.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  ubuntu-1404-x64:
-    platform: ubuntu-14.04-amd64
-    hypervisor: docker
-    image: ubuntu:14.04
-    docker_preserve_image: true
-    docker_cmd: '["/sbin/init"]'
-    docker_image_commands:
-      # ensure that upstart is booting correctly in the container
-      - 'rm /usr/sbin/policy-rc.d && rm /sbin/initctl && dpkg-divert --rename --remove /sbin/initctl && apt-get update && apt-get install -y net-tools wget && locale-gen en_US.UTF-8'
-CONFIG:
-  trace_limit: 200
diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb
index f015185b6e..4421180ba4 100644
--- a/spec/classes/apt_spec.rb
+++ b/spec/classes/apt_spec.rb
@@ -247,6 +247,12 @@
         osfamily: 'Debian',
         lsbdistcodename: 'stretch',
       },
+      'Debian 10.0' => {
+        os: { family: 'Debian', name: 'Debian', release: { major: '10', full: '10.0' } },
+        lsbdistid: 'Debian',
+        osfamily: 'Debian',
+        lsbdistcodename: 'buster',
+      },
     }
 
     facts_hash.each do |os, facts|