Skip to content

Commit e31ed44

Browse files
committed
(maint) - Various fixes in order to get the test’s running
- Code has been put in place so that when test’s are run on GCP relevant files are taking from the google cloud storage rather than artifactory - A temporary fix has been put in place to have all tests be run on sqlserver2016, pending the ability to set the sql version within the workflows
1 parent 861c78e commit e31ed44

File tree

7 files changed

+51
-34
lines changed

7 files changed

+51
-34
lines changed

.github/workflows/pr_test.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ on: [pull_request]
55
env:
66
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
77
HONEYCOMB_DATASET: litmus tests
8-
8+
SERVICE_URL: https://facade-openssh-windows-6f3kfepqcq-ew.a.run.app/v1/provision
9+
910
jobs:
1011
setup_matrix:
1112
name: "Setup Test Matrix"
@@ -55,7 +56,7 @@ jobs:
5556
id: get-matrix
5657
run: |
5758
if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
58-
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
59+
echo "::set-output name=matrix::{'platforms':[{'label':'win2016-sql2016','provider':'provision::provision_service','image':'windows-2016-core'}],'collection':['puppet7-nightly','puppet6-nightly']}"
5960
else
6061
echo "::set-output name=matrix::{}"
6162
fi

provision.yaml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,34 @@ release_checks_sql_2012:
55
provisioner: abs
66
images: ['win-2012r2-x86_64']
77
vars: 'sqlversion: sqlserver_2012'
8-
release_checks_sql_2014_parity:
8+
release_checks_sql_2014_nightly:
99
provisioner: abs
1010
images: ['win-2012r2-x86_64']
1111
vars: 'sqlversion: sqlserver_2014'
1212
release_checks_sql_2014:
1313
provisioner: abs
1414
images: ['win-2012r2-x86_64', 'win-2016-x86_64', 'win-2019-x86_64']
1515
vars: 'sqlversion: sqlserver_2014'
16-
release_checks_sql_2016_parity:
16+
release_checks_sql_2016_nightly:
1717
provisioner: abs
18-
images: ['win-2012r2-x86_64', 'win-2016-x86_64']
18+
images: ['win-2016-x86_64']
1919
vars: 'sqlversion: sqlserver_2016'
2020
release_checks_sql_2016:
2121
provisioner: abs
2222
images: ['win-2012r2-x86_64', 'win-2016-x86_64', 'win-2019-x86_64']
2323
vars: 'sqlversion: sqlserver_2016'
24+
release_checks_sql_2017_nightly:
25+
provisioner: abs
26+
images: ['win-2016-x86_64']
27+
vars: 'sqlversion: sqlserver_2017'
2428
release_checks_sql_2017:
2529
provisioner: abs
2630
images: ['win-2012r2-x86_64', 'win-2016-x86_64', 'win-2019-x86_64']
2731
vars: 'sqlversion: sqlserver_2017'
32+
release_checks_sql_2019_nightly:
33+
provisioner: abs
34+
images: ['win-2019-x86_64']
35+
vars: 'sqlversion: sqlserver_2019'
2836
release_checks_sql_2019:
2937
provisioner: abs
3038
images: ['win-2012r2-x86_64', 'win-2016-x86_64', 'win-2019-x86_64']

spec/acceptance/sqlserver_config_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
describe 'sqlserver::config test' do
1313
def ensure_sqlserver_instance(inst_name, ensure_val = 'present')
1414
pp = <<-MANIFEST
15-
sqlserver_instance{'#{inst_name}':
15+
sqlserver_instance{'#{inst_name}':
1616
ensure => '#{ensure_val}',
1717
source => 'H:',
1818
features => ['DQ', 'FullText', 'Replication', 'SQLEngine'],

spec/acceptance/sqlserver_instance_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def new_random_instance_name
99
end
1010

1111
describe 'sqlserver_instance' do
12-
version = sql_version?
12+
version = '2016' # sql_version?
1313

1414
def ensure_sqlserver_instance(features, inst_name, ensure_val = 'present', sysadmin_accounts = "['Administrator']")
1515
pp = <<-MANIFEST

spec/acceptance/sqlserver_tsql_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
require 'securerandom'
55
require 'erb'
66

7-
version = sql_version?
7+
version = '2016' # sql_version?
88

99
# database name
1010
db_name = ('DB' + SecureRandom.hex(4)).upcase

spec/acceptance/z_last_sqlserver_features_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
require 'erb'
55
require 'json'
66

7-
version = sql_version?
7+
version = '2016' # sql_version?
88

99
describe 'sqlserver_features', if: version.to_i != 2012 do
1010
def ensure_sql_features(features, ensure_val = 'present')

spec/spec_helper_acceptance_local.rb

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,18 @@ class Helper
2727
Helper.instance.run_shell('puppet module install puppetlabs/mount_iso')
2828
Helper.instance.run_shell('puppet module install puppet/archive')
2929

30-
if ENV['CLOUD_CI'] == 'true'
31-
Helper.instance.run_shell("gsutil cp -r gs://artifactory-modules/puppetlabs-sqlserver/#{WIN_2012R2_ISO} /tmp/")
32-
Helper.instance.run_shell("gsutil cp -r gs://artifactory-modules/puppetlabs-sqlserver/#{SQL_2012_ISO} /tmp/")
33-
Helper.instance.run_shell("gsutil cp -r gs://artifactory-modules/puppetlabs-sqlserver/#{SQL_2014_ISO} /tmp/")
34-
Helper.instance.run_shell("gsutil cp -r gs://artifactory-modules/puppetlabs-sqlserver/#{SQL_2016_ISO} /tmp/")
35-
Helper.instance.run_shell("gsutil cp -r gs://artifactory-modules/puppetlabs-sqlserver/#{SQL_2017_ISO} /tmp/")
36-
Helper.instance.run_shell("gsutil cp -r gs://artifactory-modules/puppetlabs-sqlserver/#{SQL_2019_ISO} /tmp/")
37-
30+
if ENV['GITHUB_ACTIONS'] == 'true'
31+
Helper.instance.run_shell("gsutil -q cp -r gs://artifactory-modules/puppetlabs-sqlserver/#{WIN_2012R2_ISO} C:/Windows/Temp/#{WIN_2012R2_ISO}")
3832
iso_opts = {
39-
folder: '/tmp',
33+
folder: 'C:/Windows/Temp',
4034
file: WIN_2012R2_ISO,
4135
drive_letter: 'I',
4236
}
4337
mount_iso(iso_opts)
4438

45-
base_install(sql_version?, '/tmp')
39+
# Temp fix to prove code works
40+
base_install('2016', 'C:/Windows/Temp')
41+
# base_install(sql_version?, 'C:/Windows/Temp')
4642
else
4743
# For Internal testing
4844
iso_opts = {
@@ -83,51 +79,63 @@ def mount_iso(opts = {})
8379
folder = opts[:folder]
8480
file = opts[:file]
8581
drive_letter = opts[:drive_letter]
86-
87-
pp = <<-MANIFEST
88-
$p_src = '#{folder}/#{file}'
89-
$source = 'C:\\#{file}'
90-
archive { $source:
91-
ensure => present,
92-
source => $p_src,
93-
user => 0,
94-
group => 0,
95-
}
96-
mount_iso{$source:
97-
require => Archive[$source],
98-
drive_letter => '#{drive_letter}',
99-
}
100-
MANIFEST
82+
pp = if ENV['GITHUB_ACTIONS'] == 'true'
83+
<<-MANIFEST
84+
mount_iso{'#{folder}/#{file}':
85+
drive_letter => '#{drive_letter}',
86+
}
87+
MANIFEST
88+
else
89+
<<-MANIFEST
90+
$p_src = '#{folder}/#{file}'
91+
$source = 'C:\\#{file}'
92+
archive { $source:
93+
ensure => present,
94+
source => $p_src,
95+
user => 0,
96+
group => 0,
97+
}
98+
mount_iso{$source:
99+
require => Archive[$source],
100+
drive_letter => '#{drive_letter}',
101+
}
102+
MANIFEST
103+
end
101104
Helper.instance.apply_manifest(pp)
102105
end
103106

104107
def base_install(sql_version, resource_root)
105108
case sql_version.to_i
106109
when 2012
110+
Helper.instance.run_shell("gsutil -q cp -r gs://artifactory-modules/puppetlabs-sqlserver/#{SQL_2012_ISO} C:/Windows/Temp/#{SQL_2012_ISO}") if ENV['GITHUB_ACTIONS'] == 'true'
107111
iso_opts = {
108112
folder: resource_root,
109113
file: SQL_2012_ISO,
110114
drive_letter: 'H',
111115
}
112116
when 2014
117+
Helper.instance.run_shell("gsutil -q cp -r gs://artifactory-modules/puppetlabs-sqlserver/#{SQL_2014_ISO} C:/Windows/Temp/#{SQL_2014_ISO}") if ENV['GITHUB_ACTIONS'] == 'true'
113118
iso_opts = {
114119
folder: resource_root,
115120
file: SQL_2014_ISO,
116121
drive_letter: 'H',
117122
}
118123
when 2016
124+
Helper.instance.run_shell("gsutil -q cp -r gs://artifactory-modules/puppetlabs-sqlserver/#{SQL_2016_ISO} C:/Windows/Temp/#{SQL_2016_ISO}") if ENV['GITHUB_ACTIONS'] == 'true'
119125
iso_opts = {
120126
folder: resource_root,
121127
file: SQL_2016_ISO,
122128
drive_letter: 'H',
123129
}
124130
when 2017
131+
Helper.instance.run_shell("gsutil -q cp -r gs://artifactory-modules/puppetlabs-sqlserver/#{SQL_2017_ISO} C:/Windows/Temp/#{SQL_2017_ISO}") if ENV['GITHUB_ACTIONS'] == 'true'
125132
iso_opts = {
126133
folder: resource_root,
127134
file: SQL_2017_ISO,
128135
drive_letter: 'H',
129136
}
130137
when 2019
138+
Helper.instance.run_shell("gsutil -q cp -r gs://artifactory-modules/puppetlabs-sqlserver/#{SQL_2019_ISO} C:/Windows/Temp/#{SQL_2019_ISO}") if ENV['GITHUB_ACTIONS'] == 'true'
131139
iso_opts = {
132140
folder: resource_root,
133141
file: SQL_2019_ISO,

0 commit comments

Comments
 (0)