From nobody Sat Jul 5 16:00:43 2025 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521473412545818.042603807221; Mon, 19 Mar 2018 08:30:12 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D1E5626AC66; Mon, 19 Mar 2018 15:30:09 +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 3041118668; Mon, 19 Mar 2018 15:30:09 +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 A45744CA99; Mon, 19 Mar 2018 15:30:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2JFU5RY015211 for ; Mon, 19 Mar 2018 11:30:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id EE3751102E32; Mon, 19 Mar 2018 15:30:04 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 938851102E30 for ; Mon, 19 Mar 2018 15:30:04 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Mon, 19 Mar 2018 16:29:55 +0100 Message-Id: <20180319152957.4951-2-abologna@redhat.com> In-Reply-To: <20180319152957.4951-1-abologna@redhat.com> References: <20180319152957.4951-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 1/3] guests: Rename 'ci' flavor to 'jenkins' 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 19 Mar 2018 15:30:11 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Having the name of the user that can access the machine match the name of the flavor, as is already the case for the 'test' flavor, makes some things easier. We can change this safely because the CentOS CI is the only user of the 'ci' flavor, and we can easily coordinate a configuration change to avoid breakages. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- guests/README.markdown | 9 +++++---- guests/lcitool | 12 ++++++------ guests/site.yml | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/guests/README.markdown b/guests/README.markdown index fa1e8a5..bc780f3 100644 --- a/guests/README.markdown +++ b/guests/README.markdown @@ -79,11 +79,12 @@ single time you want to connect. Just add to your `~/.ssh/config` file to achieve all of the above. =20 =20 -CI use ------- +Jenkins CI use +-------------- =20 -You'll need to configure `lcitool` to use the `ci` flavor for guests: -to do so, just write `ci` in the `~/.config/lcitool/flavor` file. +You'll need to configure `lcitool` to use the `jenkins` flavor for +guests: to do so, just write `jenkins` in the `~/.config/lcitool/flavor` +file. =20 Once a guest has been prepared, you'll be able to log in as root either via SSH (your public key will have been authorized) or on the serial diff --git a/guests/lcitool b/guests/lcitool index ccd0a59..5b2efb9 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -67,20 +67,20 @@ load_config() { VAULT_PASS_FILE=3D"$CONFIG_DIR/vault-password" ROOT_PASS_FILE=3D"$CONFIG_DIR/root-password" =20 - # Two flavors are supported: test (default) and ci. Read the + # Two flavors are supported: test (default) and jenkins. Read the # flavor from configuration, validate it and write it back in case # it was not present FLAVOR=3D"$(cat "$FLAVOR_FILE" 2>/dev/null)" FLAVOR=3D${FLAVOR:-test} - test "$FLAVOR" =3D test || test "$FLAVOR" =3D ci || { + test "$FLAVOR" =3D test || test "$FLAVOR" =3D jenkins || { die "$PROGRAM_NAME: Invalid flavor '$FLAVOR'" } echo "$FLAVOR" >"$FLAVOR_FILE" || { die "$PROGRAM_NAME: $FLAVOR_FILE: Unable to save flavor" } =20 - test "$FLAVOR" =3D ci && { - # The vault password is only needed for the ci flavor, so only + test "$FLAVOR" =3D jenkins && { + # The vault password is only needed for the jenkins flavor, so only # validate it in that case test -f "$VAULT_PASS_FILE" && test "$(cat "$VAULT_PASS_FILE")" || { die "$PROGRAM_NAME: $VAULT_PASS_FILE: Missing or invalid passw= ord" @@ -160,8 +160,8 @@ do_install() *kickstart*|*ks*) EXTRA_ARGS=3D"ks=3Dfile:/${INSTALL_CONFIG##*/}" = ;; esac =20 - # Only configure autostart for the guest for the ci flavor - test "$FLAVOR" =3D ci && { + # Only configure autostart for the guest for the jenkins flavor + test "$FLAVOR" =3D jenkins && { AUTOSTART=3D"--autostart" } =20 diff --git a/guests/site.yml b/guests/site.yml index 5df18e6..cb4ec0e 100644 --- a/guests/site.yml +++ b/guests/site.yml @@ -30,7 +30,7 @@ # Configure the Jenkins agent - include: tasks/jenkins.yml when: - - flavor =3D=3D 'ci' + - flavor =3D=3D 'jenkins' - projects is defined # jenkins is a pseudo-project - ( 'jenkins' in projects ) --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list