From e7af59e8959e1ee35bf1dadb03862918aade2014 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 15 Mar 2017 15:44:29 -0400 Subject: [PATCH] Remove zuulv2.5 hacks Now that zuulv3 is well into development, we can stop installing things related to zuulv2.5. Change-Id: Icd630871ad2991cdf884f6569237827100934138 Signed-off-by: Paul Belanger --- tasks/install.yaml | 13 ------------- templates/etc/zuul/zuul.conf | 1 - 2 files changed, 14 deletions(-) diff --git a/tasks/install.yaml b/tasks/install.yaml index 8653f65..6b6abd9 100644 --- a/tasks/install.yaml +++ b/tasks/install.yaml @@ -26,16 +26,3 @@ when: zuul_install_method == 'git' or zuul_install_method == 'pip' - include: "install/{{ zuul_install_method }}.yaml" - -# TODO(pabelanger): Remove once https://review.openstack.org/#/c/316387/ has -# been merged. -- name: Install missing pip dependencies - become: yes - pip: - name: "{{ item.name }}" - version: "{{ item.version|default(omit) }}" - virtualenv: "{{ zuul_pip_virtualenv|default(omit) }}" - with_items: - - { name: 'jenkins-job-builder', version: '1.6.1' } - - { name: 'pyzmq' } - when: zuul_install_method == 'git' or zuul_install_method == 'pip' diff --git a/templates/etc/zuul/zuul.conf b/templates/etc/zuul/zuul.conf index 3763cb6..fac1954 100644 --- a/templates/etc/zuul/zuul.conf +++ b/templates/etc/zuul/zuul.conf @@ -23,7 +23,6 @@ pidfile = /var/run/zuul-scheduler/zuul-scheduler.pid state_dir = /var/lib/zuul [executor] -jenkins_jobs=/var/lib/zuul log_config = /etc/zuul/executor-logging.conf workspace_root=/var/lib/zuul/workspace