@@ -99,26 +99,25 @@ node {
9999 // Commit the updated metadata.
100100 stage('Create Pull Request') {
101101 //if (shwrap("git -C installer diff --exit-code") != 0){
102- echo "enter PR stage"
103- def message = "${params.BOOTIMAGE_BUG_ID}: Update RHCOS-${RELEASE_BRANCH} to ${params.BUILD_VERSION}"
104- def commit_message = """\
105- ${params.BOOTIMAGE_BUG_ID}: Bump RHCOS ${RELEASE_BRANCH} bootimage metadata to ${params.BUILD_VERSION}
102+ pr_title = "${params.BOOTIMAGE_BUG_ID}: Update RHCOS-${RELEASE_BRANCH} bootimage metadata to ${params.BUILD_VERSION}"
103+ commit_message = """\
104+ Update RHCOS ${RELEASE_BRANCH} bootimage metadata to ${params.BUILD_VERSION}
106105
107106The changes done here will update the RHCOS ${RELEASE_BRANCH} bootimage metadata and address the following issues:
108107${params.JIRA_ISSUES}
109108
110109This change was generated using:
111110
111+ ```
112112plume cosa2stream --target ${RHCOS_METADATA_FILE} \\
113113 --distro ${params.DISTRO} --no-signatures --name ${params.STREAM} \\
114114 --url ${params.URL} \\
115115 x86_64=${params.BUILD_VERSION} \\
116116 aarch64=${params.BUILD_VERSION} \\
117117 s390x=${params.BUILD_VERSION} \\
118118 ppc64le=${params.BUILD_VERSION}
119-
119+ ```
120120 """.stripIndent().trim()
121- echo "enter commit stage"
122121 shwrap ("""
123122 cd installer
124123 git add ${RHCOS_METADATA_FILE}
@@ -131,7 +130,7 @@ plume cosa2stream --target ${RHCOS_METADATA_FILE} \\
131130 shwrap("""
132131 cd installer
133132 git push -f https://\${GHUSER}:\${GHTOKEN}@github.com/${releng_installer} ${PR_BRANCH}
134- curl -H "Authorization: token ${GHTOKEN}" -X POST -d '{ "title": "${message }", "head": "coreosbot-releng:${PR_BRANCH}", "base": "${RELEASE_BRANCH}" }' https://api.github.com/repos/openshift/installer/pulls --fail
133+ curl -H "Authorization: token ${GHTOKEN}" -X POST -d '{ "title": "${pr_title }", "head": "coreosbot-releng:${PR_BRANCH}", "base": "${RELEASE_BRANCH}" }' https://api.github.com/repos/openshift/installer/pulls --fail
135134 """)
136135 }
137136 //}
0 commit comments