fix merge

Author: elfranne

metadata.json

@@ -86,6 +86,7 @@
       "version_requirement": ">= 7.0.0 < 9.0.0"
     }
   ],
+  "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
   "template-ref": "heads/main-0-g01c6a19",
   "pdk-version": "3.0.0"
 }

provision.yaml

@@ -1,35 +1,31 @@
 ---
 default:
-  provisioner: docker
+  provisioner: abs
   images:
-  - litmusimage/centos:7
+  - redhat-8-x86_64
 vagrant:
   provisioner: vagrant
   images:
   - centos/7
+  - generic/ubuntu1804
 docker_deb:
   provisioner: docker
   images:
-  - litmusimage/debian:8
   - litmusimage/debian:9
   - litmusimage/debian:10
 docker_ub_6:
   provisioner: docker
-travis_el7:
+  images:
   - ubuntu:14.04
   - ubuntu:16.04
   - ubuntu:18.04
   - ubuntu:20.04
 docker_el7:
   provisioner: docker
   images:
-  - litmusimage/centos:7
-  - litmusimage/oraclelinux:7
-  - litmusimage/scientificlinux:7
-travis_el8:
-  provisioner: docker
-  images:
-  - litmusimage/centos:8
+  - centos:7
+  - oraclelinux:7
+  - scientificlinux/sl:7
 release_checks_6:
   provisioner: abs
   images:
@@ -48,21 +44,11 @@ release_checks_6:
   - debian-9-x86_64
   - debian-10-x86_64
   - sles-12-x86_64
+  - sles-15-x86_64
   - ubuntu-1404-x86_64
   - ubuntu-1604-x86_64
   - ubuntu-1804-x86_64
   - ubuntu-2004-x86_64
-  - win-2008-x86_64
-  - win-2008r2-x86_64
-  - win-2012-x86_64
-  - win-2012r2-x86_64
-  - win-2016-x86_64
-  - win-2019-x86_64
-  - win-2022-x86_64
-  - win-7-x86_64
-  - win-81-x86_64
-  - win-10-pro-x86_64
-  - win-11-pro-x86_64
 release_checks_7:
   provisioner: abs
   images:
@@ -77,10 +63,4 @@ release_checks_7:
   - debian-9-x86_64
   - debian-10-x86_64
   - ubuntu-1804-x86_64
-  - ubuntu-2004-x86_64
-  - win-2012r2-x86_64
-  - win-2016-x86_64
-  - win-2019-x86_64
-  - win-2022-x86_64
-  - win-10-pro-x86_64
-  - win-11-pro-x86_64
+  - ubuntu-2004-x86_64