Missing fixes related to jenkins/zuul-launcher

Change-Id: I511ae952ba6a9fede0b5e79cb8e4291cf99f6741
softwarefactory-project · Dec 21, 2017 · bded993 · bded993
1 parent 46457ba
commit bded993
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/ansible/roles/sf-jenkins/defaults/main.yml b/ansible/roles/sf-jenkins/defaults/main.yml
@@ -10,9 +10,9 @@ role_actions:
   - disable
 
 jenkins_repo_name: jenkins
-jenkins_repo_desc: Jenkins repository
-jenkins_repo_url: https://pkg.jenkins.io/redhat-stable/
-jenkins_repo_gpgkey: https://pkg.jenkins.io/redhat-stable/jenkins.io.key
+jenkins_repo_desc: Jenkins-1.x repository
+jenkins_repo_url: https://softwarefactory-project.io/mirrors/repos/jenkins/
+jenkins_repo_gpgkey: https://softwarefactory-project.io/mirrors/repos/jenkins/jenkins.io.key
 jenkins_repo_gpgcheck: 1
 
 jenkins_heap_limit: 256m

diff --git a/ansible/roles/sf-nodepool/templates/_nodepool.yaml.j2 b/ansible/roles/sf-nodepool/templates/_nodepool.yaml.j2
@@ -19,8 +19,10 @@ cron:
   check: '*/15 * * * *'
 
 targets:
+{% if 'zuul-launcher' in roles and nodepool_zuul_launcher_target|default(True) %}
   - name: zuul
     assign-via-gearman: True
+{% endif %}
 {% if 'jenkins' in roles %}
   - name: default
 {% endif %}

diff --git a/ansible/roles/sf-zuul/templates/zuul.conf.j2 b/ansible/roles/sf-zuul/templates/zuul.conf.j2
@@ -1,6 +1,6 @@
 [gearman]
 server={{ zuul_server_host }}
-check_job_registration=true
+check_job_registration=false
 
 [gearman_server]
 start=true