Drop incomplete use_puppetlabs
This knob is incomplete. We do not use package installation for lint,
syntax, unit and litmus tests and we always use puppetlabs package in
integration tests.
Setting use_puppetlabs results in conflict with the installation steps
in each jobs.
Change-Id: I9c84b73b68197d5d7d5764ed6a43cb22c3bca8e5
(cherry picked from commit c2000f96e5)
This commit is contained in:
committed by
Joel Capitao
parent
b17f462f64
commit
45c79cfc80
@@ -87,35 +87,3 @@
|
||||
- ruby-dev
|
||||
- zlib1g-dev
|
||||
- python3-pip
|
||||
|
||||
- block:
|
||||
- name: Set up puppetlabs repo (CentOS/RHEL)
|
||||
dnf:
|
||||
name: "https://yum.puppetlabs.com/puppet{{ puppet }}-release-el-{{ ansible_distribution_major_version }}.noarch.rpm"
|
||||
become: true
|
||||
|
||||
- name: Install puppetlabs puppet-agent (CentOS/RHEL)
|
||||
dnf:
|
||||
name: puppet-agent
|
||||
become: true
|
||||
|
||||
when:
|
||||
- use_puppetlabs is defined
|
||||
- use_puppetlabs|bool
|
||||
- ansible_os_family == 'RedHat'
|
||||
|
||||
- block:
|
||||
- name: Set up puppetlabs repo (Ubuntu and Debian)
|
||||
apt:
|
||||
name: "https://apt.puppetlabs.com/puppet{{ puppet }}-release-{{ ansible_distribution_release }}.deb"
|
||||
become: true
|
||||
|
||||
- name: Install puppetlabs puppet-agent (Ubuntu and Debian)
|
||||
apt:
|
||||
name: puppet-agent
|
||||
become: true
|
||||
|
||||
when:
|
||||
- use_puppetlabs is defined
|
||||
- use_puppetlabs|bool
|
||||
- ansible_os_family == 'Debian'
|
||||
|
||||
@@ -115,7 +115,6 @@
|
||||
nodeset: ubuntu-jammy
|
||||
vars:
|
||||
puppet: 7
|
||||
use_puppetlabs: false
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-module-base
|
||||
|
||||
Reference in New Issue
Block a user