Skip to content

Commit adf5ddd

Browse files
committed
Use withCredential closures in test-performance job
Change-Id: Ic0496c9a71984a0541e06622f96b9fd4eda9527a
1 parent 113fa50 commit adf5ddd

1 file changed

Lines changed: 12 additions & 16 deletions

File tree

buildscripts/scripts/test-performance.groovy

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,25 +56,21 @@ void main() {
5656
mount_credentials: true,
5757
privileged: true,
5858
) {
59-
withCredentials([
60-
string(
61-
credentialsId: 'JIRA_API_TOKEN_QA_ALERTS',
62-
variable: 'QA_JIRA_API_TOKEN'
63-
),
64-
]) {
65-
withCredentialFileAtLocation(creds: [
59+
test_jenkins_helper.execute_test([
60+
name: make_target,
61+
cmd: "make -C tests ${make_target}",
62+
// output_file: "test-performance.txt",
63+
container_name: "this-distro-container",
64+
65+
creds_files: [
6666
[credentialsId: "QA_POSTGRES_KEY_FILE", location: "${checkout_dir}/QA_POSTGRES_KEY",],
6767
[credentialsId: "QA_POSTGRES_CERT_FILE", location: "${checkout_dir}/QA_POSTGRES_CERT",],
6868
[credentialsId: "QA_ROOT_CERT_FILE", location: "${checkout_dir}/QA_ROOT_CERT",],
69-
]) {
70-
test_jenkins_helper.execute_test([
71-
name: make_target,
72-
cmd: "make -C tests ${make_target}",
73-
// output_file: "test-performance.txt",
74-
container_name: "this-distro-container",
75-
]);
76-
}
77-
}
69+
],
70+
cred_env: [
71+
string(credentialsId: 'JIRA_API_TOKEN_QA_ALERTS', variable: 'QA_JIRA_API_TOKEN'),
72+
],
73+
]);
7874
}
7975
}
8076

0 commit comments

Comments
 (0)