From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B5C6B156871 for ; Tue, 3 Sep 2024 14:48:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725374934; cv=none; b=TNJ+ZBbAdNLjwUX2CXph9QZ/uO3ZpSYb6FSqaBpcfZFZbMbIJ8g51RBR+hy1bggYD2ZAEfRaju9XDOq9YGoaLruofSz2G4B8/Jm+c8MBdjGLtUtaDq4Mdi2f0tcEN2Wf6g1xqMUHLxdPJQw43o3QhAOG46NrpJWvrcqLqookVj0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725374934; c=relaxed/simple; bh=ULee9mG8q+z7s+c2r9Nlc3FzqD3elGds+S+26z0WUyM=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=FpljETcR1HMny3XMqTmXenfmnDGeG/MCJRs9w+kNru01sS4MfuY7OKFNNectgY9w6482gp6t7pZrhpzOkyGzHICWw38WXrg+nCcoXk2lKuVCoNF73Te3UhcsfvSEkgYa/zudldRYga8+1cvqvz5VMo0SHINiRzB3pGucGY4NQpA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=g3WzlkjW; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="g3WzlkjW" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725374931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vOyONCNpfL0ax6xWvRg4SHhX5E2nvZTznFRuYZitOwc=; b=g3WzlkjWFiW2Pzgkj0mzpckuWxeL6aSxy2ZMFmEGo/QkMZqBqt0YSAGNMKgr28EEkGJO7H dvckaG1IMjp8VY1Vl5AU3z5TKHaXQmGcjytJOA5U9LtAiG1aTJS6iqzQ0+Ud8ZaMla4TSO IqSEA6BOVZrLXKBx40OqcvD9ekoS2i0= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-593-VdJRqXQXMCaHHVZmmN87Mw-1; Tue, 03 Sep 2024 10:48:50 -0400 X-MC-Unique: VdJRqXQXMCaHHVZmmN87Mw-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AB2EE1954B19 for ; Tue, 3 Sep 2024 14:48:49 +0000 (UTC) Received: from aion.redhat.com (unknown [10.22.9.161]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 261573002249 for ; Tue, 3 Sep 2024 14:48:48 +0000 (UTC) Received: from aion.redhat.com (localhost [IPv6:::1]) by aion.redhat.com (Postfix) with ESMTP id 4D7331F1239 for ; Tue, 3 Sep 2024 10:48:47 -0400 (EDT) From: Scott Mayhew To: kdevops@lists.linux.dev Subject: [PATCH 2/2] gitr: Make gitr work on RHEL/CentOS Date: Tue, 3 Sep 2024 10:48:47 -0400 Message-ID: <20240903144847.355326-2-smayhew@redhat.com> In-Reply-To: <20240903144847.355326-1-smayhew@redhat.com> References: <20240903144847.355326-1-smayhew@redhat.com> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true RHEL and CentOS do not ship cvsps or perl-TAP-Harness-Archive. For the former, we'll have to build it from git. For the latter, we can install it from CPAN, but we'll also have to install the perl-App-cpanminus package to do so. Also add 'make' and 'tar' to the dependencies list. These were previously getting installed inadvertently by the "Install btrfs-progs" task in playbooks/roles/devconfig/tasks/install-deps/redhat/main.yml, which was installing more than just btrfs-progs. Signed-off-by: Scott Mayhew --- playbooks/roles/gitr/defaults/main.yml | 3 ++ playbooks/roles/gitr/tasks/main.yml | 62 ++++++++++++++++++++++++++ playbooks/roles/gitr/vars/RedHat.yml | 7 ++- 3 files changed, 70 insertions(+), 2 deletions(-) diff --git a/playbooks/roles/gitr/defaults/main.yml b/playbooks/roles/gitr/defaults/main.yml index bcfbaef..ff737ca 100644 --- a/playbooks/roles/gitr/defaults/main.yml +++ b/playbooks/roles/gitr/defaults/main.yml @@ -18,3 +18,6 @@ gitr_thread_single: false gitr_thread_fast: false gitr_thread_stress: false gitr_thread_custom: false + +cvsps_git: https://github.com/andreyvit/cvsps.git +cvsps_data: "{{ data_path }}/cvsps" diff --git a/playbooks/roles/gitr/tasks/main.yml b/playbooks/roles/gitr/tasks/main.yml index 330350c..2eafeaa 100644 --- a/playbooks/roles/gitr/tasks/main.yml +++ b/playbooks/roles/gitr/tasks/main.yml @@ -11,6 +11,11 @@ failed_when: false tags: vars +- name: Set up the /data mount point + tags: ['data_partition'] + ansible.builtin.include_role: + name: create_data_partition + - name: Set the name of the test group tags: vars ansible.builtin.set_fact: @@ -42,6 +47,20 @@ paths: - 'vars' +- name: Update gitr depencies for RHEL/Centos + tags: gitr + ansible.builtin.set_fact: + gitr_packages: "{{ gitr_packages + ['perl-App-cpanminus'] }}" + when: + - ansible_distribution != "Fedora" + +- name: Update gitr dependencies for Fedora + tags: gitr + ansible.builtin.set_fact: + gitr_packages: "{{ gitr_packages + ['cvsps', 'perl-TAP-Harness-Archive'] }}" + when: + - ansible_distribution == "Fedora" + - name: Install dependencies for gitr tags: gitr become: true @@ -51,6 +70,49 @@ name: "{{ gitr_packages }}" state: present +- name: Install CPAN modules for gitr + tags: gitr + become: true + become_flags: 'su - -c' + become_method: ansible.builtin.sudo + community.general.cpanm: + name: "{{ item }}" + with_items: "{{ gitr_cpan_modules }}" + when: + - ansible_distribution != "Fedora" + +- name: git clone cvsps + tags: gitr + ansible.builtin.git: + repo: "{{ cvsps_git }}" + dest: "{{ cvsps_data }}" + update: true + retries: 3 + delay: 5 + register: result + until: not result.failed + when: + - ansible_distribution != "Fedora" + +- name: Build cvsps + tags: gitr + community.general.make: + chdir: "{{ cvsps_data }}" + jobs: "{{ ansible_processor_nproc }}" + when: + - ansible_distribution != "Fedora" + +- name: Install cvsps + tags: gitr + become: true + become_flags: 'su - -c' + become_method: ansible.builtin.sudo + community.general.make: + target: install + chdir: "{{ cvsps_data }}" + when: + - ansible_distribution != "Fedora" + - name: Set up an iSCSI initiator on the target node ansible.builtin.include_role: name: iscsi diff --git a/playbooks/roles/gitr/vars/RedHat.yml b/playbooks/roles/gitr/vars/RedHat.yml index 57f2f35..caf9840 100644 --- a/playbooks/roles/gitr/vars/RedHat.yml +++ b/playbooks/roles/gitr/vars/RedHat.yml @@ -1,7 +1,6 @@ --- gitr_packages: - cvs - - cvsps - expat-devel - gcc - gettext @@ -9,11 +8,15 @@ gitr_packages: - git-email - glibc-utils - libcurl-devel + - make - openssl-devel - perl-Memoize - - perl-TAP-Harness-Archive - perl-Test-Harness - perl-Test-Simple - subversion - subversion-perl + - tar - zlib-devel + +gitr_cpan_modules: + - TAP::Harness::Archive -- 2.44.0