-
Notifications
You must be signed in to change notification settings - Fork 1
OS - Prototype #1
base: master
Are you sure you want to change the base?
Conversation
Jenkinsfile
Outdated
@@ -3,7 +3,7 @@ properties( | |||
parameters( | |||
[ | |||
[$class: 'ValidatingStringParameterDefinition', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This block, that addes the ARCHES parameter, should be deleted since it's no longer used.
Jenkinsfile
Outdated
@@ -39,6 +39,16 @@ properties( | |||
description: 'Contains the CI_MESSAGE for a message bus triggered build.', | |||
name: 'CI_MESSAGE' | |||
) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Delete the TEST_REPO through CI_MESSAGE parameters since we don't use them.
Jenkinsfile
Outdated
defaultValue: '', | ||
description: 'Hostname of the preprovisoined host.', | ||
name: 'PREPROVISIONED_HOST' | ||
) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You need a comma after the )
since this is a list of parameters that is part of a bigger []
block
Jenkinsfile
Outdated
@@ -53,10 +63,17 @@ library( | |||
List arches = params.ARCHES.tokenize(',') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove this line, since arches are no longer relevant.
targetHost.name = params.PREPROVISIONED_HOST | ||
targetHost.arch = 'x86_64' | ||
targetHost.provisioner = 'NOOP' | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add your old withCredentials block here to set the scriptParams with the OSP credentials so we can complete the git clone :)
Jenkinsfile
Outdated
withCredentials([usernamePassword(credentialsId:'osp-jenkins-private-key', | ||
usernameVariable:'USERNAME', | ||
passwordVariable:'TOKEN',)]){ | ||
targetHost.scriptParams = "$USERNAME $PASSWORD" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
$TOKEN and $PASSWORD need to be the same
Jenkinsfile
Outdated
targetHost.arch = 'x86_64' | ||
targetHost.provisioner = 'NOOP' | ||
|
||
withCredentials([usernamePassword(credentialsId:'osp-jenkins-private-key', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
osp-jenkins-private-key is a "secretFile" not a usernamePassword.
You need to use the same credentialId from when we set up the username password creds for the gitlab account.
withCredentials([
usernamePassword(credentialsId:"osp16-gitlab-consulting-rh",
usernameVariable:'USERNAME',
passwordVariable:'PASSWORD'),
]){
targetHost.scriptParams = "$USERNAME $PASSWORD"
}
Jenkinsfile
Outdated
this, | ||
arches, | ||
targetHosts, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
targetHost is singular
No description provided.