@@ -4,8 +4,8 @@ project_name = 'terraform-provider-nsx'
4
4
project_owner = ' sky-uk'
5
5
6
6
project_src_path = " github.com/${ project_owner} /${ project_name} "
7
- git_credentials_id = ' 51e7ba41-d78c-4e30-802d-9b424fa0ab63 '
8
- git_helper_credentials_id = ' paas-jenkins-pipelines -deploy-key'
7
+ github_token_id = ' svc-paas-github-access-token-as-text '
8
+ git_credentials_id = ' svc- paas-github -deploy-key'
9
9
10
10
version_file = ' VERSION'
11
11
major_version = null
@@ -32,7 +32,7 @@ slackHelper.notificationWrapper(slackChannel, currentBuild, env, true) {
32
32
deleteDir()
33
33
git_branch = env. BRANCH_NAME
34
34
checkout scm
35
- gitHelper. prepareGit(' paas-jenkins ' , ' paas-jenkins @jenkins.paas.int.ovp.bskyb.com' )
35
+ gitHelper. prepareGit(' svc- paas-github ' , ' svc- paas-github @jenkins.paas.int.ovp.bskyb.com' )
36
36
37
37
stage ' version'
38
38
if (autoincVersion()) {
@@ -75,7 +75,7 @@ slackHelper.notificationWrapper(slackChannel, currentBuild, env, true) {
75
75
}
76
76
}
77
77
// we only release from master
78
- if (git_branch == ' master' && ! gitHelper. isLastCommitFromUser(' paas-jenkins ' )) {
78
+ if (git_branch == ' master' && ! gitHelper. isLastCommitFromUser(' svc- paas-github ' )) {
79
79
stage ' release'
80
80
def approved = true
81
81
timeout(time : 2 , unit : ' HOURS' ) {
@@ -95,8 +95,9 @@ slackHelper.notificationWrapper(slackChannel, currentBuild, env, true) {
95
95
96
96
echo " Creating GitHub Release v${ version()} "
97
97
98
- withCredentials([string(credentialsId : ' c7203be2-2bd2-407a-9876-86be3496e5e8' , variable : ' GITHUB_TOKEN' )]) {
99
- def github_release_response = gitHelper. createGitHubRelease(GITHUB_TOKEN , project_owner, project_name, version(), git_branch)
98
+ withCredentials([string(credentialsId : github_token_id, variable : ' GITHUB_TOKEN' )]) {
99
+ def github_release_response = gitHelper. createGitHubRelease(env. GITHUB_TOKEN , project_owner, project_name, version(), git_branch)
100
+ echo " ${ github_release_response} "
100
101
// FIXME: this is not working yet
101
102
// echo "Attaching artifacts to GitHub Release v${version()}"
102
103
// gitHelper.uploadToGitHubRelease(project_github_token, project_owner, project_name, github_release_response.id, "${pwd()}/coverage.html", 'application/html')
@@ -109,7 +110,7 @@ slackHelper.notificationWrapper(slackChannel, currentBuild, env, true) {
109
110
}
110
111
111
112
def loadHelpers () {
112
- fileLoader
. withGit(
' [email protected] :sky-uk/paas-jenkins-pipelines.git' ,
' master' ,
git_helper_credentials_id ,
' ' ) {
113
+ fileLoader
. withGit(
' [email protected] :sky-uk/paas-jenkins-pipelines.git' ,
' master' ,
git_credentials_id ,
' ' ) {
113
114
this . gitHelper = fileLoader. load(' lib/helpers/git' )
114
115
this . shellHelper = fileLoader. load(' lib/helpers/shell' )
115
116
this . goHelper = fileLoader. load(' lib/helpers/go' )
0 commit comments