Merge pull request puppetlabs#2903 from Iristyle/ticket/master/PUP-23…

…88-Puppet-acceptance-Ruby-2

(PUP-2388) Puppet acceptance for Ruby 2 x64

acceptance/bin/ci-bootstrap-from-artifacts.sh

@@ -36,6 +36,11 @@ if [[ "${platform}" =~ 'solaris' ]]; then
   repo_proxy="  :repo_proxy => false,"
 fi
 
+# If the platform is Windows, append $ruby_arch
+if [[ "${platform}" =~ 'win' ]]; then
+    platform="${platform}-${ruby_arch}"
+fi
+
 cat > local_options.rb <<-EOF
 {
   :hosts_file => 'config/nodes/${platform}.yaml',

acceptance/config/nodes/win2003r2.yaml → acceptance/config/nodes/win2003r2x64-rubyx64.yaml

@@ -6,20 +6,14 @@ HOSTS:
     platform: el-6-i386
     hypervisor: vcloud
     template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386
-  agent-r2-i386:
-    roles:
-      - agent
-    platform: windows-2003r2-32
-    hypervisor: vcloud
-    template: Delivery/Quality Assurance/Templates/vCloud/win-2003r2-i386
-  agent-r2-x86_64:
+  agent-2003r2-x86_64-rubyx64:
     roles:
       - agent
     platform: windows-2003r2-64
+    ruby_arch: x64
     hypervisor: vcloud
     template: Delivery/Quality Assurance/Templates/vCloud/win-2003r2-x86_64
 CONFIG:
-  filecount: 12
   datastore: instance0
   resourcepool: delivery/Quality Assurance/FOSS/Dynamic
   folder: Delivery/Quality Assurance/FOSS/Dynamic

acceptance/config/nodes/win2003r2x64-rubyx86.yaml

@@ -0,0 +1,20 @@
+HOSTS:
+  master:
+    roles:
+      - master
+      - agent
+    platform: el-6-i386
+    hypervisor: vcloud
+    template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386
+  agent-2003r2-x86_64-rubyx86:
+    roles:
+      - agent
+    platform: windows-2003r2-64
+    ruby_arch: x86
+    hypervisor: vcloud
+    template: Delivery/Quality Assurance/Templates/vCloud/win-2003r2-x86_64
+CONFIG:
+  datastore: instance0
+  resourcepool: delivery/Quality Assurance/FOSS/Dynamic
+  folder: Delivery/Quality Assurance/FOSS/Dynamic
+  pooling_api: http://vcloud.delivery.puppetlabs.net/

acceptance/config/nodes/win2003r2x86-rubyx86.yaml

@@ -0,0 +1,20 @@
+HOSTS:
+  master:
+    roles:
+      - master
+      - agent
+    platform: el-6-i386
+    hypervisor: vcloud
+    template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386
+  agent-2003r2-i386:
+    roles:
+      - agent
+    platform: windows-2003r2-32
+    ruby_arch: x86
+    hypervisor: vcloud
+    template: Delivery/Quality Assurance/Templates/vCloud/win-2003r2-i386
+CONFIG:
+  datastore: instance0
+  resourcepool: delivery/Quality Assurance/FOSS/Dynamic
+  folder: Delivery/Quality Assurance/FOSS/Dynamic
+  pooling_api: http://vcloud.delivery.puppetlabs.net/

acceptance/config/nodes/win2003.yaml → acceptance/config/nodes/win2003x64-rubyx64.yaml

@@ -6,20 +6,14 @@ HOSTS:
     platform: el-6-i386
     hypervisor: vcloud
     template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386
-  agent-i386:
-    roles:
-      - agent
-    platform: windows-2003-32
-    hypervisor: vcloud
-    template: Delivery/Quality Assurance/Templates/vCloud/win-2003-i386
-  agent-x86_64:
+  agent-2003-x86_64-rubyx64:
     roles:
       - agent
     platform: windows-2003-64
+    ruby_arch: x64
     hypervisor: vcloud
     template: Delivery/Quality Assurance/Templates/vCloud/win-2003-x86_64
 CONFIG:
-  filecount: 12
   datastore: instance0
   resourcepool: delivery/Quality Assurance/FOSS/Dynamic
   folder: Delivery/Quality Assurance/FOSS/Dynamic

acceptance/config/nodes/win2003x64-rubyx86.yaml

@@ -0,0 +1,20 @@
+HOSTS:
+  master:
+    roles:
+      - master
+      - agent
+    platform: el-6-i386
+    hypervisor: vcloud
+    template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386
+  agent-2003-x86_64-rubyx86:
+    roles:
+      - agent
+    platform: windows-2003-64
+    ruby_arch: x86
+    hypervisor: vcloud
+    template: Delivery/Quality Assurance/Templates/vCloud/win-2003-x86_64
+CONFIG:
+  datastore: instance0
+  resourcepool: delivery/Quality Assurance/FOSS/Dynamic
+  folder: Delivery/Quality Assurance/FOSS/Dynamic
+  pooling_api: http://vcloud.delivery.puppetlabs.net/

acceptance/config/nodes/win2003x86-rubyx86.yaml

@@ -0,0 +1,20 @@
+HOSTS:
+  master:
+    roles:
+      - master
+      - agent
+    platform: el-6-i386
+    hypervisor: vcloud
+    template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386
+  agent-2003-i386:
+    roles:
+      - agent
+    platform: windows-2003-32
+    ruby_arch: x86
+    hypervisor: vcloud
+    template: Delivery/Quality Assurance/Templates/vCloud/win-2003-i386
+CONFIG:
+  datastore: instance0
+  resourcepool: delivery/Quality Assurance/FOSS/Dynamic
+  folder: Delivery/Quality Assurance/FOSS/Dynamic
+  pooling_api: http://vcloud.delivery.puppetlabs.net/

acceptance/config/nodes/win2008-rubyx64.yaml

@@ -0,0 +1,20 @@
+HOSTS:
+  master:
+    roles:
+      - master
+      - agent
+    platform: el-6-i386
+    hypervisor: vcloud
+    template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386
+  agent-2008-x86_64-rubyx64:
+    roles:
+      - agent
+    platform: windows-2008-64
+    ruby_arch: x64
+    hypervisor: vcloud
+    template: Delivery/Quality Assurance/Templates/vCloud/win-2008-x86_64
+CONFIG:
+  datastore: instance0
+  resourcepool: delivery/Quality Assurance/FOSS/Dynamic
+  folder: Delivery/Quality Assurance/FOSS/Dynamic
+  pooling_api: http://vcloud.delivery.puppetlabs.net/

acceptance/config/nodes/win2008-rubyx86.yaml

@@ -0,0 +1,20 @@
+HOSTS:
+  master:
+    roles:
+      - master
+      - agent
+    platform: el-6-i386
+    hypervisor: vcloud
+    template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386
+  agent-2008-x86_64-rubyx86:
+    roles:
+      - agent
+    platform: windows-2008-64
+    ruby_arch: x86
+    hypervisor: vcloud
+    template: Delivery/Quality Assurance/Templates/vCloud/win-2008-x86_64
+CONFIG:
+  datastore: instance0
+  resourcepool: delivery/Quality Assurance/FOSS/Dynamic
+  folder: Delivery/Quality Assurance/FOSS/Dynamic
+  pooling_api: http://vcloud.delivery.puppetlabs.net/

acceptance/config/nodes/win2008r2.yaml → acceptance/config/nodes/win2008r2-rubyx64.yaml

@@ -6,14 +6,14 @@ HOSTS:
     platform: el-6-i386
     hypervisor: vcloud
     template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386
-  agent:
+  agent-2008r2-x86_64-rubyx64:
     roles:
       - agent
     platform: windows-2008r2-64
+    ruby_arch: x64
     hypervisor: vcloud
     template: Delivery/Quality Assurance/Templates/vCloud/win-2008r2-x86_64
 CONFIG:
-  filecount: 12
   datastore: instance0
   resourcepool: delivery/Quality Assurance/FOSS/Dynamic
   folder: Delivery/Quality Assurance/FOSS/Dynamic

acceptance/config/nodes/win2008-all.yaml → acceptance/config/nodes/win2008r2-rubyx86.yaml

@@ -6,20 +6,14 @@ HOSTS:
     platform: el-6-i386
     hypervisor: vcloud
     template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386
-  agent-2008r2-x86_64:
+  agent-2008r2-x86_64-rubyx86:
     roles:
       - agent
     platform: windows-2008r2-64
+    ruby_arch: x86
     hypervisor: vcloud
     template: Delivery/Quality Assurance/Templates/vCloud/win-2008r2-x86_64
-  agent-2008-x86_64:
-    roles:
-      - agent
-    platform: windows-2008-64
-    hypervisor: vcloud
-    template: Delivery/Quality Assurance/Templates/vCloud/win-2008-x86_64
 CONFIG:
-  filecount: 12
   datastore: instance0
   resourcepool: delivery/Quality Assurance/FOSS/Dynamic
   folder: Delivery/Quality Assurance/FOSS/Dynamic

acceptance/config/nodes/win2012-rubyx64.yaml

@@ -0,0 +1,20 @@
+HOSTS:
+  master:
+    roles:
+      - master
+      - agent
+    platform: el-6-i386
+    hypervisor: vcloud
+    template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386
+  agent-2012-x86_64-rubyx64:
+    roles:
+      - agent
+    platform: windows-2012-64
+    ruby_arch: x64
+    hypervisor: vcloud
+    template: Delivery/Quality Assurance/Templates/vCloud/win-2012-x86_64
+CONFIG:
+  datastore: instance0
+  resourcepool: delivery/Quality Assurance/FOSS/Dynamic
+  folder: Delivery/Quality Assurance/FOSS/Dynamic
+  pooling_api: http://vcloud.delivery.puppetlabs.net/

acceptance/config/nodes/win2012-rubyx86.yaml

@@ -0,0 +1,20 @@
+HOSTS:
+  master:
+    roles:
+      - master
+      - agent
+    platform: el-6-i386
+    hypervisor: vcloud
+    template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386
+  agent-2012-x86_64-rubyx86:
+    roles:
+      - agent
+    platform: windows-2012-64
+    ruby_arch: x86
+    hypervisor: vcloud
+    template: Delivery/Quality Assurance/Templates/vCloud/win-2012-x86_64
+CONFIG:
+  datastore: instance0
+  resourcepool: delivery/Quality Assurance/FOSS/Dynamic
+  folder: Delivery/Quality Assurance/FOSS/Dynamic
+  pooling_api: http://vcloud.delivery.puppetlabs.net/

acceptance/config/nodes/win2012-all.yaml → acceptance/config/nodes/win2012r2-rubyx64.yaml

@@ -6,20 +6,14 @@ HOSTS:
     platform: el-6-i386
     hypervisor: vcloud
     template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386
-  agent-2012r2-x86_64:
+  agent-2012r2-x86_64-rubyx64:
     roles:
       - agent
     platform: windows-2012r2-64
+    ruby_arch: x64
     hypervisor: vcloud
     template: Delivery/Quality Assurance/Templates/vCloud/win-2012r2-x86_64
-  agent-2012-x86_64:
-    roles:
-      - agent
-    platform: windows-2012-64
-    hypervisor: vcloud
-    template: Delivery/Quality Assurance/Templates/vCloud/win-2012-x86_64
 CONFIG:
-  filecount: 12
   datastore: instance0
   resourcepool: delivery/Quality Assurance/FOSS/Dynamic
   folder: Delivery/Quality Assurance/FOSS/Dynamic

acceptance/config/nodes/win2012r2-rubyx86.yaml

@@ -0,0 +1,20 @@
+HOSTS:
+  master:
+    roles:
+      - master
+      - agent
+    platform: el-6-i386
+    hypervisor: vcloud
+    template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386
+  agent-2012r2-x86_64-rubyx86:
+    roles:
+      - agent
+    platform: windows-2012r2-64
+    ruby_arch: x86
+    hypervisor: vcloud
+    template: Delivery/Quality Assurance/Templates/vCloud/win-2012r2-x86_64
+CONFIG:
+  datastore: instance0
+  resourcepool: delivery/Quality Assurance/FOSS/Dynamic
+  folder: Delivery/Quality Assurance/FOSS/Dynamic
+  pooling_api: http://vcloud.delivery.puppetlabs.net/