From c2000f96e565ce2fa57820d5c9a26eb82be0b231 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 9 Nov 2023 22:16:20 +0900 Subject: [PATCH] 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 --- playbooks/prepare-node-common.yaml | 32 ------------------------------ zuul.d/base.yaml | 1 - 2 files changed, 33 deletions(-) diff --git a/playbooks/prepare-node-common.yaml b/playbooks/prepare-node-common.yaml index 2d3ec4d7e..8fe98e06c 100644 --- a/playbooks/prepare-node-common.yaml +++ b/playbooks/prepare-node-common.yaml @@ -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' diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 351546e9c..c4272d825 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -86,7 +86,6 @@ nodeset: ubuntu-jammy vars: puppet: 7 - use_puppetlabs: false - job: name: puppet-openstack-module-base