cem_acpt 0.8.3 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '049c0d34c878395e52956c95a55dd0b1e2fafa9f8ec2e708982b1574865e0c71'
-  data.tar.gz: 5a69317f0b2da6e09d60f41cde8b45df6bb475167ec84328917f3ec9dcf0fe9c
+  metadata.gz: 3835ee97ead5dca9e1b7445b4705efef12c7de1ff7f2574bca70d55f06091b47
+  data.tar.gz: 5482b561206e95a2ee465116c829fff6b9bb953330dbdc77427221e954ccf8ac
 SHA512:
-  metadata.gz: 023d83eeceb14f629ef811781a51d28b4620c45ebd69fd8417f949d3952a1a2e89f94b42392efc93ee408399717dae0906bc820ee5d870b6052500a4f0a78879
-  data.tar.gz: a372082235f0aaf4a533262545f9cb1df04e4ed98f0428e90425d097b1d5e28f2ac8fc40a2b6bf9999707705e88918f6a3398c185eb58680777c95bea16357c6
+  metadata.gz: 597ae4e7b86e3559f40113fe9681ced0cce7152722430e17f0502d9d83aecf80526a1b8d1f3deb2586fcc8a0bf90489191d9898f52767081a2da45384e9de4e6
+  data.tar.gz: b0587d2487fcb010eea86eb196fd948d23e6e05ed602e920765c0d3e21551f3e4bb173bb971001eb9de2a8617b148cbb42e2cac6645932129e8ac3d7235e7365

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cem_acpt (0.8.3)
+    cem_acpt (0.8.5)
       async-http (>= 0.60, < 0.70)
       bcrypt_pbkdf (>= 1.0, < 2.0)
       deep_merge (>= 1.2, < 2.0)

data/lib/cem_acpt/platform/gcp.rb

@@ -21,6 +21,7 @@ module Platform
     nd = {}
     nd[:machine_type] = gcp_machine_type
     nd[:disk_size] = gcp_disk_size
+    nd[:max_run_duration] = gcp_max_run_duration
     nd[:image] = image_name if image_name
     nd[:test_name] = @test_data[:test_name] if @test_data&.key?(:test_name)
     nd
@@ -68,4 +69,8 @@ module Platform
   def gcp_disk_size
     @gcp_disk_size ||= (@config.get('node_data.disk_size') || 40)
   end
+
+  def gcp_max_run_duration
+    @gcp_max_run_duration ||= (@config.get('node_data.max_run_duration') || 3600)
+  end
 end

data/lib/cem_acpt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CemAcpt
-  VERSION = '0.8.3'
+  VERSION = '0.8.5'
 end

data/lib/terraform/gcp/linux/main.tf

@@ -49,6 +49,7 @@ variable "node_data" {
         machine_type = string
         image = string
         disk_size = number
+        max_run_duration = number
         test_name = string
         goss_file = string
         puppet_manifest = string
@@ -58,7 +59,7 @@ variable "node_data" {
     }))
 }
 
-provider "google" {
+provider "google-beta" {
     credentials = file(var.credentials_file)
     project = var.project
     region = var.region
@@ -66,7 +67,7 @@ provider "google" {
 }
 
 resource "google_compute_instance" "acpt-test-node" {
-    provider = google
+    provider = google-beta
     for_each = var.node_data
     name = each.key
     machine_type = each.value.machine_type
@@ -84,6 +85,9 @@ resource "google_compute_instance" "acpt-test-node" {
         automatic_restart = false
         provisioning_model = "SPOT"
         instance_termination_action = "DELETE"
+        max_run_duration {
+            seconds = each.value.max_run_duration
+        }
     }
 
     network_interface {
@@ -102,6 +106,7 @@ resource "google_compute_instance" "acpt-test-node" {
             port = 22
             private_key = "${file(var.private_key)}"
             agent = false
+            script_path = "/var/tmp/terraform_%RAND%.sh"
         }
         inline = [
             "sudo mkdir -p ${each.value.provision_dir_dest}",
@@ -120,6 +125,7 @@ resource "google_compute_instance" "acpt-test-node" {
             port = 22
             private_key = "${file(var.private_key)}"
             agent = false
+            script_path = "/var/tmp/terraform_%RAND%.sh"
         }
     }
 
@@ -134,6 +140,7 @@ resource "google_compute_instance" "acpt-test-node" {
             port = 22
             private_key = "${file(var.private_key)}"
             agent = false
+            script_path = "/var/tmp/terraform_%RAND%.sh"
         }
     }
 
@@ -148,6 +155,7 @@ resource "google_compute_instance" "acpt-test-node" {
             port = 22
             private_key = "${file(var.private_key)}"
             agent = false
+            script_path = "/var/tmp/terraform_%RAND%.sh"
         }
     }
 
@@ -162,6 +170,7 @@ resource "google_compute_instance" "acpt-test-node" {
             port = 22
             private_key = "${file(var.private_key)}"
             agent = false
+            script_path = "/var/tmp/terraform_%RAND%.sh"
         }
     }
 
@@ -174,6 +183,7 @@ resource "google_compute_instance" "acpt-test-node" {
             port = 22
             private_key = "${file(var.private_key)}"
             agent = false
+            script_path = "/var/tmp/terraform_%RAND%.sh"
         }
         inline = each.value.provision_commands
     }

data/lib/terraform/gcp/windows/main.tf

@@ -53,11 +53,12 @@ variable "node_data" {
         machine_type = string
         image = string
         disk_size = number
+        max_run_duration = number
         test_name = string
     }))
 }
 
-provider "google" {
+provider "google-beta" {
     credentials = file(var.credentials_file)
     project = var.project
     region = var.region
@@ -65,7 +66,7 @@ provider "google" {
 }
 
 resource "google_compute_instance" "acpt-test-node" {
-    provider = google
+    provider = google-beta
     for_each = var.node_data
     name = each.key
     machine_type = each.value.machine_type
@@ -83,6 +84,9 @@ resource "google_compute_instance" "acpt-test-node" {
         automatic_restart = false
         provisioning_model = "SPOT"
         instance_termination_action = "DELETE"
+        max_run_duration {
+            seconds = each.value.max_run_duration
+        }
     }
 
     network_interface {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cem_acpt
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.5
 platform: ruby
 authors:
 - puppetlabs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-12 00:00:00.000000000 Z
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http