Skip to content

Commit a2548fe

Browse files
JavagedesJavagedes
committed
Verify tests run on VS2019 & Windows
1 parent c7783e0 commit a2548fe

File tree

3 files changed

+92
-90
lines changed

3 files changed

+92
-90
lines changed

‎integration_test/edk2_platform_GCC5.robot

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ Documentation A test suite to test Platform CI on edk2 repo
44
# Copyright (c), Microsoft Corporation
55
# SPDX-License-Identifier: BSD-2-Clause-Patent
66

7-
Library Process
8-
Library OperatingSystem
9-
Library String
7+
Library Process
8+
Library OperatingSystem
9+
Library String
1010

11-
Resource Shared_Keywords.robot
11+
Resource Shared_Keywords.robot
1212

13-
Suite Setup One time setup ${repo_url} ${ws_dir}
13+
Suite Setup One time setup ${repo_url} ${ws_dir}
1414

1515
# Suite Setup
1616

@@ -44,13 +44,13 @@ One time setup
4444
Run Edk2 Ovmf IA32 DEBUG
4545
[Documentation] This test will run IA32 DEBUG build for OvmfPkg
4646
[Tags] PlatformCI OvmfPkg IA32 GCC5 Windows Qemu Edk2
47-
${arch}= Set Variable IA32
48-
${target}= Set Variable DEBUG
49-
${package}= Set Variable OvmfPkg
50-
${ci_file}= Set Variable {package}${/}${PlatformCI}${/}PlatformBuild.py
47+
${arch}= Set Variable IA32
48+
${target}= Set Variable DEBUG
49+
${package}= Set Variable OvmfPkg
50+
${ci_file}= Set Variable ${package}${/}PlatformCI${/}PlatformBuild.py
5151

5252
# make sure on default branch
53-
Reset git repo to default branch ${ws_root} ${default_branch}
53+
Reset git repo to default branch ${ws_root} ${default_branch}
5454

5555
Stuart setup ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
5656
Stuart update ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
@@ -61,13 +61,13 @@ Run Edk2 Ovmf IA32 DEBUG
6161
Run Edk2 Ovmf IA32 RELEASE
6262
[Documentation] This test will run IA32 RELEASE build for OvmfPkg
6363
[Tags] PlatformCI OvmfPkg IA32 GCC5 Windows Qemu Edk2
64-
${arch}= Set Variable IA32
65-
${target}= Set Variable RELEASE
66-
${package}= Set Variable OvmfPkg
67-
${ci_file}= Set Variable {package}${/}${PlatformCI}${/}PlatformBuild.py
64+
${arch}= Set Variable IA32
65+
${target}= Set Variable RELEASE
66+
${package}= Set Variable OvmfPkg
67+
${ci_file}= Set Variable ${package}${/}PlatformCI${/}PlatformBuild.py
6868

6969
# make sure on default branch
70-
Reset git repo to default branch ${ws_root} ${default_branch}
70+
Reset git repo to default branch ${ws_root} ${default_branch}
7171

7272
Stuart setup ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
7373
Stuart update ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
@@ -78,13 +78,13 @@ Run Edk2 Ovmf IA32 RELEASE
7878
Run Edk2 Ovmf X64 DEBUG
7979
[Documentation] This test will run X64 DEBUG build for OvmfPkg
8080
[Tags] PlatformCI OvmfPkg X64 GCC5 Windows Qemu Edk2
81-
${arch}= Set Variable X64
82-
${target}= Set Variable DEBUG
83-
${package}= Set Variable OvmfPkg
84-
${ci_file}= Set Variable {package}${/}${PlatformCI}${/}PlatformBuild.py
81+
${arch}= Set Variable X64
82+
${target}= Set Variable DEBUG
83+
${package}= Set Variable OvmfPkg
84+
${ci_file}= Set Variable ${package}${/}PlatformCI${/}PlatformBuild.py
8585

8686
# make sure on default branch
87-
Reset git repo to default branch ${ws_root} ${default_branch}
87+
Reset git repo to default branch ${ws_root} ${default_branch}
8888

8989
Stuart setup ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
9090
Stuart update ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
@@ -95,13 +95,13 @@ Run Edk2 Ovmf X64 DEBUG
9595
Run Edk2 Ovmf X64 RELEASE
9696
[Documentation] This test will run X64 RELEASE build for OvmfPkg
9797
[Tags] PlatformCI OvmfPkg X64 GCC5 Windows Qemu Edk2
98-
${arch}= Set Variable X64
99-
${target}= Set Variable RELEASE
100-
${package}= Set Variable OvmfPkg
101-
${ci_file}= Set Variable {package}${/}${PlatformCI}${/}PlatformBuild.py
98+
${arch}= Set Variable X64
99+
${target}= Set Variable RELEASE
100+
${package}= Set Variable OvmfPkg
101+
${ci_file}= Set Variable ${package}${/}PlatformCI${/}PlatformBuild.py
102102

103103
# make sure on default branch
104-
Reset git repo to default branch ${ws_root} ${default_branch}
104+
Reset git repo to default branch ${ws_root} ${default_branch}
105105

106106
Stuart setup ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
107107
Stuart update ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
@@ -112,13 +112,13 @@ Run Edk2 Ovmf X64 RELEASE
112112
Run Edk2 Emulator IA32 DEBUG
113113
[Documentation] This test will run IA32 DEBUG build for EmulatorPkg
114114
[Tags] PlatformCI EmulatorPkg IA32 GCC5 Windows Qemu Edk2
115-
${arch}= Set Variable IA32
116-
${target}= Set Variable DEBUG
117-
${package}= Set Variable EmulatorPkg
118-
${ci_file}= Set Variable {package}${/}${PlatformCI}${/}PlatformBuild.py
115+
${arch}= Set Variable IA32
116+
${target}= Set Variable DEBUG
117+
${package}= Set Variable EmulatorPkg
118+
${ci_file}= Set Variable ${package}${/}PlatformCI${/}PlatformBuild.py
119119

120120
# make sure on default branch
121-
Reset git repo to default branch ${ws_root} ${default_branch}
121+
Reset git repo to default branch ${ws_root} ${default_branch}
122122

123123
Stuart setup ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
124124
Stuart update ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
@@ -129,13 +129,13 @@ Run Edk2 Emulator IA32 DEBUG
129129
Run Edk2 Emulator IA32 RELEASE
130130
[Documentation] This test will run IA32 RELEASE build for EmulatorPkg
131131
[Tags] PlatformCI EmulatorPkg IA32 GCC5 Windows Qemu Edk2
132-
${arch}= Set Variable IA32
133-
${target}= Set Variable RELEASE
134-
${package}= Set Variable EmulatorPkg
135-
${ci_file}= Set Variable {package}${/}${PlatformCI}${/}PlatformBuild.py
132+
${arch}= Set Variable IA32
133+
${target}= Set Variable RELEASE
134+
${package}= Set Variable EmulatorPkg
135+
${ci_file}= Set Variable ${package}${/}PlatformCI${/}PlatformBuild.py
136136

137137
# make sure on default branch
138-
Reset git repo to default branch ${ws_root} ${default_branch}
138+
Reset git repo to default branch ${ws_root} ${default_branch}
139139

140140
Stuart setup ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
141141
Stuart update ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
@@ -146,13 +146,13 @@ Run Edk2 Emulator IA32 RELEASE
146146
Run Edk2 Emulator X64 DEBUG
147147
[Documentation] This test will run X64 DEBUG build for EmulatorPkg
148148
[Tags] PlatformCI EmulatorPkg X64 GCC5 Windows Qemu Edk2
149-
${arch}= Set Variable X64
150-
${target}= Set Variable DEBUG
151-
${package}= Set Variable EmulatorPkg
152-
${ci_file}= Set Variable {package}${/}${PlatformCI}${/}PlatformBuild.py
149+
${arch}= Set Variable X64
150+
${target}= Set Variable DEBUG
151+
${package}= Set Variable EmulatorPkg
152+
${ci_file}= Set Variable ${package}${/}PlatformCI${/}PlatformBuild.py
153153

154154
# make sure on default branch
155-
Reset git repo to default branch ${ws_root} ${default_branch}
155+
Reset git repo to default branch ${ws_root} ${default_branch}
156156

157157
Stuart setup ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
158158
Stuart update ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
@@ -163,13 +163,13 @@ Run Edk2 Emulator X64 DEBUG
163163
Run Edk2 Emulator X64 RELEASE
164164
[Documentation] This test will run X64 RELEASE build for EmulatorPkg
165165
[Tags] PlatformCI EmulatorPkg X64 GCC5 Windows Qemu Edk2
166-
${arch}= Set Variable X64
167-
${target}= Set Variable RELEASE
168-
${package}= Set Variable EmulatorPkg
169-
${ci_file}= Set Variable {package}${/}${PlatformCI}${/}PlatformBuild.py
166+
${arch}= Set Variable X64
167+
${target}= Set Variable RELEASE
168+
${package}= Set Variable EmulatorPkg
169+
${ci_file}= Set Variable ${package}${/}PlatformCI${/}PlatformBuild.py
170170

171171
# make sure on default branch
172-
Reset git repo to default branch ${ws_root} ${default_branch}
172+
Reset git repo to default branch ${ws_root} ${default_branch}
173173

174174
Stuart setup ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
175175
Stuart update ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}

‎integration_test/edk2_platform_VS2019.robot

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ Documentation A test suite to test Platform CI on edk2 repo
44
# Copyright (c), Microsoft Corporation
55
# SPDX-License-Identifier: BSD-2-Clause-Patent
66

7-
Library Process
8-
Library OperatingSystem
9-
Library String
7+
Library Process
8+
Library OperatingSystem
9+
Library String
1010

11-
Resource Shared_Keywords.robot
11+
Resource Shared_Keywords.robot
1212

13-
Suite Setup One time setup ${repo_url} ${ws_dir}
13+
Suite Setup One time setup ${repo_url} ${ws_dir}
1414

1515
# Suite Setup
1616

@@ -44,13 +44,13 @@ One time setup
4444
Run Edk2 Ovmf IA32 DEBUG
4545
[Documentation] This test will run IA32 DEBUG build for OvmfPkg
4646
[Tags] PlatformCI OvmfPkg IA32 VS2019 Windows Qemu Edk2
47-
${arch}= Set Variable IA32
48-
${target}= Set Variable DEBUG
49-
${package}= Set Variable OvmfPkg
50-
${ci_file}= Set Variable {package}${/}${PlatformCI}${/}PlatformBuild.py
47+
${arch}= Set Variable IA32
48+
${target}= Set Variable DEBUG
49+
${package}= Set Variable OvmfPkg
50+
${ci_file}= Set Variable ${package}${/}PlatformCI${/}PlatformBuild.py
5151

5252
# make sure on default branch
53-
Reset git repo to default branch ${ws_root} ${default_branch}
53+
Reset git repo to default branch ${ws_root} ${default_branch}
5454

5555
Stuart setup ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
5656
Stuart update ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
@@ -61,13 +61,13 @@ Run Edk2 Ovmf IA32 DEBUG
6161
Run Edk2 Ovmf IA32 RELEASE
6262
[Documentation] This test will run IA32 RELEASE build for OvmfPkg
6363
[Tags] PlatformCI OvmfPkg IA32 VS2019 Windows Qemu Edk2
64-
${arch}= Set Variable IA32
65-
${target}= Set Variable RELEASE
66-
${package}= Set Variable OvmfPkg
67-
${ci_file}= Set Variable {package}${/}${PlatformCI}${/}PlatformBuild.py
64+
${arch}= Set Variable IA32
65+
${target}= Set Variable RELEASE
66+
${package}= Set Variable OvmfPkg
67+
${ci_file}= Set Variable ${package}${/}PlatformCI${/}PlatformBuild.py
6868

6969
# make sure on default branch
70-
Reset git repo to default branch ${ws_root} ${default_branch}
70+
Reset git repo to default branch ${ws_root} ${default_branch}
7171

7272
Stuart setup ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
7373
Stuart update ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
@@ -78,13 +78,13 @@ Run Edk2 Ovmf IA32 RELEASE
7878
Run Edk2 Ovmf X64 DEBUG
7979
[Documentation] This test will run X64 DEBUG build for OvmfPkg
8080
[Tags] PlatformCI OvmfPkg X64 VS2019 Windows Qemu Edk2
81-
${arch}= Set Variable X64
82-
${target}= Set Variable DEBUG
83-
${package}= Set Variable OvmfPkg
84-
${ci_file}= Set Variable {package}${/}${PlatformCI}${/}PlatformBuild.py
81+
${arch}= Set Variable X64
82+
${target}= Set Variable DEBUG
83+
${package}= Set Variable OvmfPkg
84+
${ci_file}= Set Variable ${package}${/}PlatformCI${/}PlatformBuild.py
8585

8686
# make sure on default branch
87-
Reset git repo to default branch ${ws_root} ${default_branch}
87+
Reset git repo to default branch ${ws_root} ${default_branch}
8888

8989
Stuart setup ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
9090
Stuart update ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
@@ -95,13 +95,13 @@ Run Edk2 Ovmf X64 DEBUG
9595
Run Edk2 Ovmf X64 RELEASE
9696
[Documentation] This test will run X64 RELEASE build for OvmfPkg
9797
[Tags] PlatformCI OvmfPkg X64 VS2019 Windows Qemu Edk2
98-
${arch}= Set Variable X64
99-
${target}= Set Variable RELEASE
100-
${package}= Set Variable OvmfPkg
101-
${ci_file}= Set Variable {package}${/}${PlatformCI}${/}PlatformBuild.py
98+
${arch}= Set Variable X64
99+
${target}= Set Variable RELEASE
100+
${package}= Set Variable OvmfPkg
101+
${ci_file}= Set Variable ${package}${/}PlatformCI${/}PlatformBuild.py
102102

103103
# make sure on default branch
104-
Reset git repo to default branch ${ws_root} ${default_branch}
104+
Reset git repo to default branch ${ws_root} ${default_branch}
105105

106106
Stuart setup ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
107107
Stuart update ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
@@ -112,13 +112,13 @@ Run Edk2 Ovmf X64 RELEASE
112112
Run Edk2 Emulator IA32 DEBUG
113113
[Documentation] This test will run IA32 DEBUG build for EmulatorPkg
114114
[Tags] PlatformCI EmulatorPkg IA32 VS2019 Windows Qemu Edk2
115-
${arch}= Set Variable IA32
116-
${target}= Set Variable DEBUG
117-
${package}= Set Variable EmulatorPkg
118-
${ci_file}= Set Variable {package}${/}${PlatformCI}${/}PlatformBuild.py
115+
${arch}= Set Variable IA32
116+
${target}= Set Variable DEBUG
117+
${package}= Set Variable EmulatorPkg
118+
${ci_file}= Set Variable ${package}${/}PlatformCI${/}PlatformBuild.py
119119

120120
# make sure on default branch
121-
Reset git repo to default branch ${ws_root} ${default_branch}
121+
Reset git repo to default branch ${ws_root} ${default_branch}
122122

123123
Stuart setup ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
124124
Stuart update ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
@@ -129,13 +129,13 @@ Run Edk2 Emulator IA32 DEBUG
129129
Run Edk2 Emulator IA32 RELEASE
130130
[Documentation] This test will run IA32 RELEASE build for EmulatorPkg
131131
[Tags] PlatformCI EmulatorPkg IA32 VS2019 Windows Qemu Edk2
132-
${arch}= Set Variable IA32
133-
${target}= Set Variable RELEASE
134-
${package}= Set Variable EmulatorPkg
135-
${ci_file}= Set Variable {package}${/}${PlatformCI}${/}PlatformBuild.py
132+
${arch}= Set Variable IA32
133+
${target}= Set Variable RELEASE
134+
${package}= Set Variable EmulatorPkg
135+
${ci_file}= Set Variable ${package}${/}PlatformCI${/}PlatformBuild.py
136136

137137
# make sure on default branch
138-
Reset git repo to default branch ${ws_root} ${default_branch}
138+
Reset git repo to default branch ${ws_root} ${default_branch}
139139

140140
Stuart setup ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
141141
Stuart update ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
@@ -146,13 +146,13 @@ Run Edk2 Emulator IA32 RELEASE
146146
Run Edk2 Emulator X64 DEBUG
147147
[Documentation] This test will run X64 DEBUG build for EmulatorPkg
148148
[Tags] PlatformCI EmulatorPkg X64 VS2019 Windows Qemu Edk2
149-
${arch}= Set Variable X64
150-
${target}= Set Variable DEBUG
151-
${package}= Set Variable EmulatorPkg
152-
${ci_file}= Set Variable {package}${/}${PlatformCI}${/}PlatformBuild.py
149+
${arch}= Set Variable X64
150+
${target}= Set Variable DEBUG
151+
${package}= Set Variable EmulatorPkg
152+
${ci_file}= Set Variable ${package}${/}PlatformCI${/}PlatformBuild.py
153153

154154
# make sure on default branch
155-
Reset git repo to default branch ${ws_root} ${default_branch}
155+
Reset git repo to default branch ${ws_root} ${default_branch}
156156

157157
Stuart setup ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
158158
Stuart update ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
@@ -163,13 +163,13 @@ Run Edk2 Emulator X64 DEBUG
163163
Run Edk2 Emulator X64 RELEASE
164164
[Documentation] This test will run X64 RELEASE build for EmulatorPkg
165165
[Tags] PlatformCI EmulatorPkg X64 VS2019 Windows Qemu Edk2
166-
${arch}= Set Variable X64
167-
${target}= Set Variable RELEASE
168-
${package}= Set Variable EmulatorPkg
169-
${ci_file}= Set Variable {package}${/}${PlatformCI}${/}PlatformBuild.py
166+
${arch}= Set Variable X64
167+
${target}= Set Variable RELEASE
168+
${package}= Set Variable EmulatorPkg
169+
${ci_file}= Set Variable ${package}${/}PlatformCI${/}PlatformBuild.py
170170

171171
# make sure on default branch
172-
Reset git repo to default branch ${ws_root} ${default_branch}
172+
Reset git repo to default branch ${ws_root} ${default_branch}
173173

174174
Stuart setup ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}
175175
Stuart update ${ci_file} ${arch} ${target} ${package} ${tool_chain} ${ws_root}

‎integration_test/pip-requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
edk2-pytool-library==0.11.2 # Match edk2
2+
edk2-pytool-extensions~=0.16.0 # Match edk2
13
robotframework
24
regex

0 commit comments

Comments
 (0)