Skip to content

Commit 255efa8

Browse files
committed
fixup! RHINENG-22499: jeniknsfile for gh-pr-and-build job
1 parent c5c9491 commit 255efa8

1 file changed

Lines changed: 15 additions & 5 deletions

File tree

Jenkinsfile

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
// Jenkinsfile for gh-pr-and-build template
22
// See: https://www.jenkins.io/doc/book/pipeline/jenkinsfile/
33

4+
def secrets = [
5+
[path: params.VAULT_PATH_SVC_ACCOUNT_EPHEMERAL, engineVersion: 1, secretValues: [
6+
[envVar: 'OC_LOGIN_TOKEN_DEV', vaultKey: 'oc-login-token-dev'],
7+
[envVar: 'OC_LOGIN_SERVER_DEV', vaultKey: 'oc-login-server-dev']]],
8+
[path: params.VAULT_PATH_QUAY_PUSH, engineVersion: 1, secretValues: [
9+
[envVar: 'QUAY_USER', vaultKey: 'user'],
10+
[envVar: 'QUAY_TOKEN', vaultKey: 'token']]],
11+
[path: params.VAULT_PATH_RHR_PULL, engineVersion: 1, secretValues: [
12+
[envVar: 'RH_REGISTRY_USER', vaultKey: 'user'],
13+
[envVar: 'RH_REGISTRY_TOKEN', vaultKey: 'token']]]
14+
]
15+
16+
def configuration = [vaultUrl: params.VAULT_ADDRESS, vaultCredentialId: params.VAULT_CREDS_ID, engineVersion: 1]
17+
418
pipeline {
519
// Agent configuration - defines where the pipeline runs
620
agent {
@@ -44,11 +58,7 @@ pipeline {
4458
[
4559
// Vault path containing the secrets
4660
path: 'app-sre/quay/app-sre-push',
47-
secretValues: [
48-
// Map Vault keys to environment variables
49-
[envVar: 'QUAY_USER', vaultKey: 'user'],
50-
[envVar: 'QUAY_TOKEN', vaultKey: 'token']
51-
]
61+
secretValues: secrets
5262
]
5363
]
5464
]) {

0 commit comments

Comments
 (0)