Skip to content

Commit fe3d363

Browse files
committed
GPII-4195: Add tests for each flavour of Windows 10
1 parent dc902a6 commit fe3d363

File tree

2 files changed

+85
-20
lines changed

2 files changed

+85
-20
lines changed

jenkins_jobs/gpii-app.yml

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
wrappers:
1515
- timeout:
1616
# Abort after these many minutes
17-
timeout: 120
17+
timeout: 180
1818
# Mark the build as failed
1919
fail: true
2020
builders:
@@ -34,10 +34,16 @@
3434
- name: gpii-app-code-analysis
3535
predefined-parameters: parent_workspace=$WORKSPACE
3636
- multijob:
37-
name: gpii-app-test
37+
name: gpii-app-test-1909
3838
condition: COMPLETED
3939
projects:
40-
- name: gpii-app-test
40+
- name: gpii-app-test-latest
41+
predefined-parameters: parent_workspace=$WORKSPACE
42+
- multijob:
43+
name: gpii-app-test-ltsc
44+
condition: COMPLETED
45+
projects:
46+
- name: gpii-app-test-ltsc
4147
predefined-parameters: parent_workspace=$WORKSPACE
4248
- multijob:
4349
name: delete-gpii-app-vm
@@ -73,7 +79,24 @@
7379
node: h-0005.tor1.incd.ca
7480
workspace: $parent_workspace
7581
builders:
76-
- shell: vagrant winrm -c "do.ps1 -c 'grunt lint'"
82+
- shell: vagrant winrm LTSC -c "do.ps1 -c 'grunt lint'"
83+
publishers:
84+
- email:
85+
recipients: [email protected]
86+
wrappers:
87+
- timeout:
88+
# Abort after these many minutes
89+
timeout: 60
90+
# Mark the build as failed
91+
fail: true
92+
93+
- job:
94+
name: gpii-app-test-1909
95+
description: 'GPII-APP tests in the latest version of Windows 10'
96+
node: h-0005.tor1.incd.ca
97+
workspace: $parent_workspace
98+
builders:
99+
- shell: vagrant winrm latest -c "do.ps1 -c 'npm test'"
77100
publishers:
78101
- email:
79102
recipients: [email protected]
@@ -85,12 +108,12 @@
85108
fail: true
86109

87110
- job:
88-
name: gpii-app-test
89-
description: 'GPII-APP tests'
111+
name: gpii-app-test-ltsc
112+
description: 'GPII-APP tests in LTSC Windows 10'
90113
node: h-0005.tor1.incd.ca
91114
workspace: $parent_workspace
92115
builders:
93-
- shell: vagrant winrm -c "do.ps1 -c 'npm test'"
116+
- shell: vagrant winrm LTSC -c "do.ps1 -c 'npm test'"
94117
publishers:
95118
- email:
96119
recipients: [email protected]

jenkins_jobs/windows.yml

Lines changed: 55 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: windows-tests
33
description: 'Main Jenkins job responsible for orchestrating tasks required to run GPII Windows tests'
44
project-type: multijob
5-
build_timeout: 120
5+
build_timeout: 180
66
node: h-0005.tor1.incd.ca
77
properties:
88
# Required by the GitHub PR builder plugin.
@@ -15,7 +15,7 @@
1515
wrappers:
1616
- timeout:
1717
# Abort after these many minutes
18-
timeout: 120
18+
timeout: 180
1919
# Mark the build as failed
2020
fail: true
2121
builders:
@@ -35,16 +35,28 @@
3535
- name: windows-code-analysis
3636
predefined-parameters: parent_workspace=$WORKSPACE
3737
- multijob:
38-
name: windows-unit-tests
38+
name: windows-unit-tests-1909
3939
condition: COMPLETED
4040
projects:
41-
- name: windows-unit-tests
41+
- name: windows-unit-tests-1909
4242
predefined-parameters: parent_workspace=$WORKSPACE
4343
- multijob:
44-
name: windows-acceptance-tests
44+
name: windows-acceptance-tests-1909
4545
condition: COMPLETED
4646
projects:
47-
- name: windows-acceptance-tests
47+
- name: windows-acceptance-tests-1909
48+
predefined-parameters: parent_workspace=$WORKSPACE
49+
- multijob:
50+
name: windows-unit-tests-ltsc
51+
condition: COMPLETED
52+
projects:
53+
- name: windows-unit-tests-ltsc
54+
predefined-parameters: parent_workspace=$WORKSPACE
55+
- multijob:
56+
name: windows-acceptance-tests-ltsc
57+
condition: COMPLETED
58+
projects:
59+
- name: windows-acceptance-tests-ltsc
4860
predefined-parameters: parent_workspace=$WORKSPACE
4961
- multijob:
5062
name: windows-delete-vm
@@ -74,18 +86,48 @@
7486
node: h-0005.tor1.incd.ca
7587
workspace: $parent_workspace
7688
builders:
77-
- shell: vagrant winrm -c "do.ps1 -c 'grunt lint'"
89+
- shell: vagrant winrm LTSC -c "do.ps1 -c 'grunt lint'"
90+
publishers:
91+
- email:
92+
recipients: [email protected]
93+
94+
- job:
95+
name: windows-unit-tests-ltsc
96+
description: 'GPII Windows unit tests in LTSC Windows 10'
97+
node: h-0005.tor1.incd.ca
98+
workspace: $parent_workspace
99+
builders:
100+
- shell: vagrant winrm LTSC -c "do.ps1 -c 'npm run test:unit'"
78101
publishers:
79102
- email:
80103
recipients: [email protected]
104+
wrappers:
105+
- timeout:
106+
timeout: 90
107+
fail: true
108+
109+
- job:
110+
name: windows-acceptance-tests-ltsc
111+
description: 'GPII Windows acceptance tests in LTSC Windows 10'
112+
node: h-0005.tor1.incd.ca
113+
workspace: $parent_workspace
114+
builders:
115+
- shell: vagrant winrm LTSC -c "do.ps1 -c 'npm run test:acceptance'"
116+
publishers:
117+
- email:
118+
recipients: [email protected]
119+
wrappers:
120+
- timeout:
121+
timeout: 90
122+
fail: true
81123

82124
- job:
83-
name: windows-unit-tests
84-
description: 'GPII Windows unit tests'
125+
name: windows-unit-tests-1909
126+
description: 'GPII Windows unit tests in lastest version of Windows 10'
85127
node: h-0005.tor1.incd.ca
86128
workspace: $parent_workspace
87129
builders:
88-
- shell: vagrant winrm -c "do.ps1 -c 'npm run test:unit'"
130+
- shell: vagrant winrm 1909 -c "do.ps1 -c 'npm run test:unit'"
89131
publishers:
90132
- email:
91133
recipients: [email protected]
@@ -95,12 +137,12 @@
95137
fail: true
96138

97139
- job:
98-
name: windows-acceptance-tests
99-
description: 'GPII Windows acceptance tests'
140+
name: windows-acceptance-tests-1909
141+
description: 'GPII Windows acceptance tests in lastest version of Windows 10'
100142
node: h-0005.tor1.incd.ca
101143
workspace: $parent_workspace
102144
builders:
103-
- shell: vagrant winrm -c "do.ps1 -c 'npm run test:acceptance'"
145+
- shell: vagrant winrm 1909 -c "do.ps1 -c 'npm run test:acceptance'"
104146
publishers:
105147
- email:
106148
recipients: [email protected]

0 commit comments

Comments
 (0)