Skip to content

Commit 02b6736

Browse files
committed
ci: fix archiving artefacts and run on windows-04 exclusively
1 parent e9069a1 commit 02b6736

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

ci/Jenkinsfile.tests-e2e.windows

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ library '[email protected]'
44
pipeline {
55

66
agent {
7-
label 'windows && x86_64 && qt-6.9.0 && go-1.23 && windows-04'
7+
label 'windows-t && windows-04'
88
}
99

1010
parameters {
@@ -63,9 +63,8 @@ pipeline {
6363
environment {
6464
PLATFORM = 'tests/e2e'
6565

66-
SQUISH_DIR = 'C:/squish-runner-9.0.1-qt-6.9'
67-
PYTHONPATH = "${SQUISH_DIR}/lib:${SQUISH_DIR}/lib/python:${PYTHONPATH}"
68-
LD_LIBRARY_PATH = "${SQUISH_DIR}/lib:${SQUISH_DIR}/python3/lib:${LD_LIBRARY_PATH}"
66+
SQUISH_DIR = 'C:\\squish-runner-9.0.1-qt-6.9'
67+
PYTHONPATH = "${SQUISH_DIR}\\lib;${SQUISH_DIR}\\bin;${SQUISH_DIR}\\lib\\python;${PYTHONPATH}"
6968

7069
/* To stop e2e tests using port 8545 */
7170
STATUS_RUNTIME_HTTP_API = 'False'
@@ -119,8 +118,8 @@ pipeline {
119118
steps { script { dir('test/e2e') {
120119
bat """
121120
python310 -m venv ${VIRTUAL_ENV}
122-
${VIRTUAL_ENV}\\Scripts\\python.exe -m pip install --upgrade pip
123-
${VIRTUAL_ENV}\\Scripts\\python.exe -m pip install -r requirements.txt
121+
python310 -m pip install --upgrade pip
122+
python310 -m pip install -r requirements.txt
124123
"""
125124
} } }
126125
}
@@ -158,7 +157,7 @@ pipeline {
158157
stage('Unpack') {
159158
steps { timeout(5) { script { dir('test/e2e') {
160159
sh 'mkdir aut'
161-
sh "7z x '${utils.findFile('pkg/*tar.gz')}' -o'./aut'"
160+
sh "7z x '${utils.findFile('pkg/*.7z')}' -o'./aut'"
162161
env.AUT_PATH = utils.findFile('aut/Status/*.exe').replace('\\','/')
163162
} } } }
164163
}
@@ -183,11 +182,9 @@ pipeline {
183182
ln -sf _local.ci.py _local.py || cp _local.ci.py _local.py
184183
popd
185184
186-
# Run tests
187-
${VIRTUAL_ENV}\\Scripts\\python.exe -m pytest -m "not keycard" -v --reruns=1 --timeout=300 ${flagStr} `
188-
--disable-warnings `
189-
--alluredir=./allure-results `
190-
-o timeout_func_only=true
185+
"""
186+
bat"""
187+
python310 -m pytest -m "not keycard" -v --reruns=1 --timeout=300 ${flagStr} --disable-warnings --alluredir=./allure-results -o timeout_func_only=true
191188
"""
192189
}
193190
}
@@ -199,7 +196,7 @@ pipeline {
199196

200197
post {
201198
always { script { dir('test/e2e') {
202-
archiveArtifacts('aut/*.log')
199+
archiveArtifacts('aut/Status/*.txt')
203200

204201
/* Needed to categorize types of errors and add environment section in allure report. */
205202
sh 'cp ext/allure_files/categories.json allure-results'

0 commit comments

Comments
 (0)