Push the changes to the coreos main repo

coreos · Nov 25, 2024 · 7fa472c · 7fa472c
1 parent dc58259
commit 7fa472c
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/jobs/bump-jenkins-plugins.Jenkinsfile b/jobs/bump-jenkins-plugins.Jenkinsfile
@@ -21,7 +21,6 @@ def getVersionFromPluginUrl(pluginUrl) {
     def parts = pluginUrl.split("/")
     def pluginVersion
     if (parts.size() >= 4) {
-        def groupId = parts[-3]
         pluginVersion = parts[-2]
     } else {
         error("Unable to extract plugin version from the URL.")
@@ -121,11 +120,22 @@ node {
                 withCredentials([usernamePassword(credentialsId: botCreds,
                                                   usernameVariable: 'GHUSER',
                                                   passwordVariable: 'GHTOKEN')]) {
-                                                    shwrap("""
-                                                        cd fedora-coreos-pipeline
-                                                        git push -f https://\${GHUSER}:\${GHTOKEN}@github.com/${fork_repo} main:${pr_branch}
-                                                        curl -H "Authorization: token ${GHTOKEN}" -X POST -d '{ "title": "${message}", "head": "${pr_branch}", "base": "main" }' https://api.github.com/repos/${fork_repo}/pulls
-                                                    """)
+                    // Push to the forked repo
+                    shwrap("""
+                        cd fedora-coreos-pipeline
+                        git push -f https://\${GHUSER}:\${GHTOKEN}@github.com/${fork_repo} main:${pr_branch}
+                    """)
+
+                    // Create a PR against the "coreos:main" repo
+                    def response = shwrapCapture("""
+                        curl -H "Authorization: token ${GHTOKEN}" -X POST -d '{ "title": "${message}", "head": "coreosbot-releng:${pr_branch}", "base": "main" }' https://api.github.com/repos/${repo}/pulls --fail
+                    """)
+
+                    println("GitHub API response: ${response}")
+
+                    if (response.contains("\"message\": \"Validation Failed\"")) {
+                        error("GitHub API request failed: ${response}")
+                    }
                 }
             }
         }