Skip to content

Commit

Permalink
use newer packer version
Browse files Browse the repository at this point in the history
  • Loading branch information
Bryce Larson committed Oct 28, 2020
1 parent 58b4930 commit ae722a9
Show file tree
Hide file tree
Showing 36 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion cicd/jenkins/amazon-2
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/amazon-2-docker
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/arch-lts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/arch-lts-docker
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/centos-7
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/centos-7-docker
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/centos-8
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/centos-8-docker
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/debian-10
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/debian-10-docker
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/debian-9
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/debian-9-docker
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/fedora-32
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/fedora-32-docker
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/fedora-33
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/fedora-33-docker
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/freebsd-121
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/macosx-catalina
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/macosx-mojave
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/opensuse-15
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/opensuse-15-docker
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/ubuntu-1604
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/ubuntu-1604-docker
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/ubuntu-1804
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/ubuntu-1804-docker
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/ubuntu-2004
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/ubuntu-2004-docker
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 6
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/windows-2016
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 8
Expand Down
2 changes: 1 addition & 1 deletion cicd/jenkins/windows-2019
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('salt@master-1.8-golden') _
@Library('salt@master-1.9-golden') _

// Define the maximum time, in hours, that a test run should run for
def testrun_timeout = 8
Expand Down
2 changes: 1 addition & 1 deletion os-images/Docker/amazon/amazon.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
{
"type": "docker-tag",
"repository": "{{ user `docker_repository` }}/{{ user `build_type` | lower }}-{{ user `os_name` | lower }}-{{ user `os_version` }}",
"tag": "latest"
"tags": "latest"
},
{
"type": "docker-push",
Expand Down
2 changes: 1 addition & 1 deletion os-images/Docker/arch/arch.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
{
"type": "docker-tag",
"repository": "{{ user `docker_repository` }}/{{ user `build_type` | lower }}-{{ user `os_name` | lower }}-{{ user `os_version` }}",
"tag": "latest"
"tags": "latest"
},
{
"type": "docker-push",
Expand Down
2 changes: 1 addition & 1 deletion os-images/Docker/centos/centos.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
{
"type": "docker-tag",
"repository": "{{ user `docker_repository` }}/{{ user `build_type` | lower }}-{{ user `os_name` | lower }}-{{ user `os_version` }}",
"tag": "latest"
"tags": "latest"
},
{
"type": "docker-push",
Expand Down
2 changes: 1 addition & 1 deletion os-images/Docker/debian/debian.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
{
"type": "docker-tag",
"repository": "{{ user `docker_repository` }}/{{ user `build_type` | lower }}-{{ user `os_name` | lower }}-{{ user `os_version` }}",
"tag": "latest"
"tags": "latest"
},
{
"type": "docker-push",
Expand Down
2 changes: 1 addition & 1 deletion os-images/Docker/fedora/fedora.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
{
"type": "docker-tag",
"repository": "{{ user `docker_repository` }}/{{ user `build_type` | lower }}-{{ user `os_name` | lower }}-{{ user `os_version` }}",
"tag": "latest"
"tags": "latest"
},
{
"type": "docker-push",
Expand Down
2 changes: 1 addition & 1 deletion os-images/Docker/opensuse/opensuse.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
{
"type": "docker-tag",
"repository": "{{ user `docker_repository` }}/{{ user `build_type` | lower }}-{{ user `os_name` | lower }}-{{ user `os_version` }}",
"tag": "latest"
"tags": "latest"
},
{
"type": "docker-push",
Expand Down
2 changes: 1 addition & 1 deletion os-images/Docker/ubuntu/ubuntu.json
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
{
"type": "docker-tag",
"repository": "{{ user `docker_repository` }}/{{ user `build_type` | lower }}-{{ user `os_name` | lower }}-{{ user `os_version` }}",
"tag": "latest"
"tags": "latest"
},
{
"type": "docker-push",
Expand Down

0 comments on commit ae722a9

Please sign in to comment.