cem_acpt 0.8.4 → 0.8.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +1 -1
  3. data/lib/cem_acpt/platform/gcp.rb +5 -0
  4. data/lib/cem_acpt/version.rb +1 -1
  5. data/lib/terraform/gcp/linux/main.tf +6 -2
  6. data/lib/terraform/gcp/windows/main.tf +6 -2
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 787d1c625a43532fe24478c1dd0e6a078737121e0fd3f0c9b3de33dd4d2f8e2d
4
- data.tar.gz: 64eae38282ae2ade5ecbff398f297842114d9f7ed702f9460997836e551c7d75
3
+ metadata.gz: 3835ee97ead5dca9e1b7445b4705efef12c7de1ff7f2574bca70d55f06091b47
4
+ data.tar.gz: 5482b561206e95a2ee465116c829fff6b9bb953330dbdc77427221e954ccf8ac
5
5
  SHA512:
6
- metadata.gz: 955300268e06a6a00a0a7ab3849b2a2f5e3dd05e46b9020d9c5ecc5d999e14fff229947a9e9c47db8071a8b3fa4b2cd740070b5b5a53dd69e97092fb57676ec4
7
- data.tar.gz: 14cde5b14ebdf22baa7c720355c596e6825eed11b775bfd9a15baa695ececdb3cc63d0bf56c38e5e7d3dd862151ddd7ca3932c9583aed7eeed1966d1e9eebd02
6
+ metadata.gz: 597ae4e7b86e3559f40113fe9681ced0cce7152722430e17f0502d9d83aecf80526a1b8d1f3deb2586fcc8a0bf90489191d9898f52767081a2da45384e9de4e6
7
+ data.tar.gz: b0587d2487fcb010eea86eb196fd948d23e6e05ed602e920765c0d3e21551f3e4bb173bb971001eb9de2a8617b148cbb42e2cac6645932129e8ac3d7235e7365
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- cem_acpt (0.8.4)
4
+ cem_acpt (0.8.5)
5
5
  async-http (>= 0.60, < 0.70)
6
6
  bcrypt_pbkdf (>= 1.0, < 2.0)
7
7
  deep_merge (>= 1.2, < 2.0)
data/lib/cem_acpt/platform/gcp.rb CHANGED
@@ -21,6 +21,7 @@ module Platform
21
21
  nd = {}
22
22
  nd[:machine_type] = gcp_machine_type
23
23
  nd[:disk_size] = gcp_disk_size
24
+ nd[:max_run_duration] = gcp_max_run_duration
24
25
  nd[:image] = image_name if image_name
25
26
  nd[:test_name] = @test_data[:test_name] if @test_data&.key?(:test_name)
26
27
  nd
@@ -68,4 +69,8 @@ module Platform
68
69
  def gcp_disk_size
69
70
  @gcp_disk_size ||= (@config.get('node_data.disk_size') || 40)
70
71
  end
72
+
73
+ def gcp_max_run_duration
74
+ @gcp_max_run_duration ||= (@config.get('node_data.max_run_duration') || 3600)
75
+ end
71
76
  end
data/lib/cem_acpt/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module CemAcpt
4
- VERSION = '0.8.4'
4
+ VERSION = '0.8.5'
5
5
  end
data/lib/terraform/gcp/linux/main.tf CHANGED
@@ -49,6 +49,7 @@ variable "node_data" {
49
49
  machine_type = string
50
50
  image = string
51
51
  disk_size = number
52
+ max_run_duration = number
52
53
  test_name = string
53
54
  goss_file = string
54
55
  puppet_manifest = string
@@ -58,7 +59,7 @@ variable "node_data" {
58
59
  }))
59
60
  }
60
61
 
61
- provider "google" {
62
+ provider "google-beta" {
62
63
  credentials = file(var.credentials_file)
63
64
  project = var.project
64
65
  region = var.region
@@ -66,7 +67,7 @@ provider "google" {
66
67
  }
67
68
 
68
69
  resource "google_compute_instance" "acpt-test-node" {
69
- provider = google
70
+ provider = google-beta
70
71
  for_each = var.node_data
71
72
  name = each.key
72
73
  machine_type = each.value.machine_type
@@ -84,6 +85,9 @@ resource "google_compute_instance" "acpt-test-node" {
84
85
  automatic_restart = false
85
86
  provisioning_model = "SPOT"
86
87
  instance_termination_action = "DELETE"
88
+ max_run_duration {
89
+ seconds = each.value.max_run_duration
90
+ }
87
91
  }
88
92
 
89
93
  network_interface {
data/lib/terraform/gcp/windows/main.tf CHANGED
@@ -53,11 +53,12 @@ variable "node_data" {
53
53
  machine_type = string
54
54
  image = string
55
55
  disk_size = number
56
+ max_run_duration = number
56
57
  test_name = string
57
58
  }))
58
59
  }
59
60
 
60
- provider "google" {
61
+ provider "google-beta" {
61
62
  credentials = file(var.credentials_file)
62
63
  project = var.project
63
64
  region = var.region
@@ -65,7 +66,7 @@ provider "google" {
65
66
  }
66
67
 
67
68
  resource "google_compute_instance" "acpt-test-node" {
68
- provider = google
69
+ provider = google-beta
69
70
  for_each = var.node_data
70
71
  name = each.key
71
72
  machine_type = each.value.machine_type
@@ -83,6 +84,9 @@ resource "google_compute_instance" "acpt-test-node" {
83
84
  automatic_restart = false
84
85
  provisioning_model = "SPOT"
85
86
  instance_termination_action = "DELETE"
87
+ max_run_duration {
88
+ seconds = each.value.max_run_duration
89
+ }
86
90
  }
87
91
 
88
92
  network_interface {
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cem_acpt
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.4
4
+ version: 0.8.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - puppetlabs
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2023-09-14 00:00:00.000000000 Z
11
+ date: 2023-10-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: async-http