Fix GitHub API URI

The previous API URI no longer works for public GitHub. For GitHub Enterprise, the suffix '/api/v3' is still used.
open-power-host-os · Oct 18, 2017 · 996ffab · 996ffab
1 parent e5d4484
commit 996ffab
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/...-pipeline/templates/org.jenkinsci.plugins.github_branch_source.GitHubConfiguration.xml.j2 b/...-pipeline/templates/org.jenkinsci.plugins.github_branch_source.GitHubConfiguration.xml.j2
@@ -3,7 +3,7 @@
   <endpoints>
     <org.jenkinsci.plugins.github__branch__source.Endpoint>
       <name>github_domain</name>
-      <apiUri>https://{{github_domain}}/api/v3</apiUri>
+      <apiUri>{{github_api_uri}}</apiUri>
     </org.jenkinsci.plugins.github__branch__source.Endpoint>
   </endpoints>
 </org.jenkinsci.plugins.github__branch__source.GitHubConfiguration>
diff --git a/ansible/roles/jenkins-seed-job/templates/seed_job_config.xml.j2 b/ansible/roles/jenkins-seed-job/templates/seed_job_config.xml.j2
@@ -36,6 +36,11 @@
           <description>GitHub domain.</description>
           <defaultValue>{{github_domain}}</defaultValue>
         </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>GITHUB_API_URI</name>
+          <description>GitHub API URI.</description>
+          <defaultValue>{{github_api_uri}}</defaultValue>
+        </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>GITHUB_ORGANIZATION_NAME</name>
           <description>GitHub organization from where the Host OS repositories will be checked out.</description>

diff --git a/ansible/vars-master.yaml b/ansible/vars-master.yaml
@@ -10,3 +10,9 @@ jenkins_port: 8080
 jenkins_local_url: "http://127.0.0.1:{{jenkins_port}}"
 
 configure_ldap: no
+
+# Public and Enterprise GitHub API URIs are different
+public_github_api_uri: "https://api.{{github_domain}}"
+enterprise_github_api_uri: "https://{{github_domain}}/api/v3"
+using_public_github_domain: "{{github_domain == 'github.com'}}"
+github_api_uri: "{{public_github_api_uri if using_public_github_domain else enterprise_github_api_uri}}"
diff --git a/jenkins_jobs/build_pipelines.groovy b/jenkins_jobs/build_pipelines.groovy
@@ -2,7 +2,7 @@ def createPipeline(String repositoryName) {
   multibranchPipelineJob(repositoryName) {
     branchSources {
       github {
-        apiUri("https://$GITHUB_DOMAIN/api/v3")
+        apiUri(GITHUB_API_URI)
         scanCredentialsId('github-user-pass-credentials')
         repoOwner(GITHUB_ORGANIZATION_NAME)
         repository(repositoryName)