From nobody Tue Apr 16 18:57:52 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1562855524; cv=none; d=zoho.com; s=zohoarc; b=O4i9S9mxeVGfY9fisWKpyzh876MCX3Dx3yu0zoNsXBALEzXDjlFSKLgdXY5rDqUWyjdR+TvAN0GBnbGK7iju1DMrDbbo0uan6aQeAxl7VIXtS+AKQTeTqUu3VXp7mb/BXhTyHvmFobHrgjVdz3BoEHeER2kgwo+XazQjtJ3v+mU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562855524; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=rT6gPL7GpL1IJDnuBWEfbHfyoeCLXYKulbRKV2o4UCk=; b=ONpuGT+pNeVRK1+oF/5hugqpCi2toG10SeRBeuY8yXV9EBTQzjmtrJS6gAc0V3oxnKlIxr5EjZcQW04lqc33GroP6BErmon4jJI+VudxoL2CRxhdt27d8cKyty+iokc7+pPK5vA8vQH43g8jnMcB2V7HEagoqIwzKr9bjvKovvg= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1562855524914480.1757876081456; Thu, 11 Jul 2019 07:32:04 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B3E5330C1CD6; Thu, 11 Jul 2019 14:32:02 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8B8571001B16; Thu, 11 Jul 2019 14:32:02 +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 508061833003; Thu, 11 Jul 2019 14:32:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x6BEW0MP000952 for ; Thu, 11 Jul 2019 10:32:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 625FD1001B16; Thu, 11 Jul 2019 14:32:00 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.73]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D3F3B101E665 for ; Thu, 11 Jul 2019 14:31:59 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 11 Jul 2019 16:31:58 +0200 Message-Id: <20190711143158.32554-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH] guests: Create java symlink on FreeBSD 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 11 Jul 2019 14:32:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" This kludge is necessary because the OpenJDK 11 packages, unlike the OpenJDK 8 packages, install all binaries outside of $PATH. Signed-off-by: Andrea Bolognani --- Pushed so that I could bring the CI environment back online; if people have objections to the approach, we can make the necessary changes as a follow-up. guests/playbooks/update/main.yml | 2 +- guests/playbooks/update/tasks/kludges.yml | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/guests/playbooks/update/main.yml b/guests/playbooks/update/mai= n.yml index 753bac4..e82055b 100644 --- a/guests/playbooks/update/main.yml +++ b/guests/playbooks/update/main.yml @@ -48,10 +48,10 @@ - flavor =3D=3D "jenkins" =20 # Configure environment. Needs to happen after installing packages + - include: '{{ playbook_base }}/tasks/kludges.yml' - include: '{{ playbook_base }}/tasks/paths.yml' - include: '{{ playbook_base }}/tasks/bootloader.yml' - include: '{{ playbook_base }}/tasks/services.yml' - - include: '{{ playbook_base }}/tasks/kludges.yml' - include: '{{ playbook_base }}/tasks/users.yml' =20 # Configure the Jenkins agent diff --git a/guests/playbooks/update/tasks/kludges.yml b/guests/playbooks/u= pdate/tasks/kludges.yml index 3648514..22d8ce5 100644 --- a/guests/playbooks/update/tasks/kludges.yml +++ b/guests/playbooks/update/tasks/kludges.yml @@ -1,4 +1,18 @@ --- +# FreeBSD allows multiple versions of OpenJDK to be installed and used +# in parallel, which is neat but also means they must all live outside +# of $PATH. Create a symlink so that we can still find the main Java +# executable. +- name: Create java symlink + file: + src: /usr/local/openjdk11/bin/java + dest: /usr/local/bin/java + state: link + owner: root + group: wheel + when: + - os_name =3D=3D 'FreeBSD' + # FreeBSD compiles bash without defining SSH_SOURCE_BASHRC, which means # it won't try to detect when it's spawned by ssh and source ~/.bashrc # when that's the case. Our workaround is setting $BASH_ENV globally --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list