Re: [PATCH 2/2] gitr: Make gitr work on RHEL/CentOS

[Scott Mayhew <smayhew@redhat.com>]

On Wed, 04 Sep 2024, Chuck Lever wrote:

> On Tue, Sep 03, 2024 at 10:48:47AM -0400, Scott Mayhew wrote:
> > 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 <smayhew@redhat.com>
> > ---
> >  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
> > 
> > 
> 
> Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
> 
> With stock kdevops, I'm seeing some gitr failures (eg, t6300) on
> Fedora 40 that were not there on Fedora 39. Wondering if this series
> might help with that.

Unfortunately no - the only effect that these patches should have on
Fedora is that the devconfig playbook is no longer accidentally
installing extra packages.

I'm seeing this failures on 6.10.6-200.fc40.x86_64:

Test Summary Report
-------------------
./t6300-for-each-ref.sh                            (Wstat: 256 (exited 1) Tests: 418 Failed: 3)
  Failed tests:  35, 107-108
  Non-zero exit status: 1
./t9001-send-email.sh                              (Wstat: 256 (exited 1) Tests: 199 Failed: 4)
  Failed tests:  37, 48-50
  Non-zero exit status: 1
Files=999, Tests=29254, 1711 wallclock secs (17.16 usr  4.92 sys + 1259.25 cusr 2402.60 csys = 3683.93 CPU)
Result: FAIL

and the *.stderr files have no info in them at all.

Everything passed on 6.10.6-100.fc39.x86_64.

> 
> -- 
> Chuck Lever
>