From nobody Tue Feb 10 10:24:45 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1507712663610993.1869162955066; Wed, 11 Oct 2017 02:04:23 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D405C820FA; Wed, 11 Oct 2017 09:04:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C09F262945; Wed, 11 Oct 2017 09:04:20 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 622DC410B2; Wed, 11 Oct 2017 09:04:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v9B8qTQL018333 for ; Wed, 11 Oct 2017 04:52:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 97D6B4C4; Wed, 11 Oct 2017 08:52:29 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.40.205.10]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EFD2865E82 for ; Wed, 11 Oct 2017 08:52:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D405C820FA Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 11 Oct 2017 10:52:18 +0200 Message-Id: <20171011085218.5236-3-abologna@redhat.com> In-Reply-To: <20171011085218.5236-1-abologna@redhat.com> References: <20171011085218.5236-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [libvirt-jenkins-ci PATCH 2/2] ansible: Use built-in init system detection X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 11 Oct 2017 09:04:22 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Ansible already exposes the type of init system in use through the ansible_service_mgr fact, so we can drop our own detection. Signed-off-by: Andrea Bolognani --- ansible/tasks/jenkins.yml | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/ansible/tasks/jenkins.yml b/ansible/tasks/jenkins.yml index 563f220..9c8eda1 100644 --- a/ansible/tasks/jenkins.yml +++ b/ansible/tasks/jenkins.yml @@ -12,24 +12,6 @@ owner: jenkins group: jenkins =20 -- name: Figure out how to start Jenkins agent - set_fact: - use_rc_local: true - use_systemd: false - when: - - ( os_name =3D=3D 'FreeBSD' or - ( os_name =3D=3D 'CentOS' and os_version =3D=3D '6' ) or - ( os_name =3D=3D 'Ubuntu' and os_version =3D=3D '12' ) or - ( os_name =3D=3D 'Ubuntu' and os_version =3D=3D '14' ) ) - -- name: Figure out how to start Jenkins agent - set_fact: - use_rc_local: false - use_systemd: true - when: - - use_rc_local is not defined - - use_systemd is not defined - - name: Configure and enable Jenkins agent lineinfile: path: /etc/rc.local @@ -39,14 +21,14 @@ line: "nohup {{ sudo }} -u jenkins {{ bash }} -l -c '{{ java }} -jar /= home/jenkins/slave.jar -jnlpUrl \"{{ jenkins_url }}\" -secret \"{{ jenkins_= secret }}\"' >/var/log/jenkins.log 2>&1 &" insertbefore: '^exit .*$' when: - - use_rc_local + - ansible_service_mgr !=3D 'systemd' =20 - name: Configure Jenkins agent template: src: templates/jenkins.service.j2 dest: /etc/systemd/system/jenkins.service when: - - use_systemd + - ansible_service_mgr =3D=3D 'systemd' =20 - name: Enable Jenkins agent systemd: @@ -54,4 +36,4 @@ enabled: yes daemon_reload: yes when: - - use_systemd + - ansible_service_mgr =3D=3D 'systemd' --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list