From a2d0f0196d46b4b034767a08b08fd40e97757bc6 Mon Sep 17 00:00:00 2001 From: Webb Scales Date: Wed, 24 May 2023 11:19:15 -0400 Subject: [PATCH] Remove Fedora-36 support from the Agent Update default usage to F38. PBENCH-1162 --- agent/containers/images/Makefile | 2 +- agent/containers/images/README.md | 4 ++-- agent/rpm/Makefile | 2 +- agent/rpm/pbench-agent.spec.j2 | 6 +----- contrib/containerized-pbench/pbench_demo | 2 +- jenkins/Makefile | 2 +- jenkins/Pipeline.gy | 2 +- 7 files changed, 8 insertions(+), 12 deletions(-) diff --git a/agent/containers/images/Makefile b/agent/containers/images/Makefile index 5692613486..aa1da9bb00 100644 --- a/agent/containers/images/Makefile +++ b/agent/containers/images/Makefile @@ -108,7 +108,7 @@ _ALL_RPMS = ${_TOOL_RPMS} ${_WORKLOAD_RPMS} # By default we only build images for the following distributions. _DEFAULT_DISTROS = \ centos-9 centos-8 centos-7 \ - fedora-38 fedora-37 fedora-36 + fedora-38 fedora-37 # rhel-9 rhel-8 rhel-7 # This Makefile produces containers named "pbench-agent--"; this diff --git a/agent/containers/images/README.md b/agent/containers/images/README.md index 3ff99b8d46..62f5271e8a 100644 --- a/agent/containers/images/README.md +++ b/agent/containers/images/README.md @@ -52,8 +52,8 @@ localhost/pbench-agent-all-centos-8 v0.69.3-1 9396f0337681 ... ``` There are make targets for each of the five supported distributions, CentOS 9 -(`centos-9`), CentOS 8 (`centos-8`), CentOS 7 (`centos-7`), Fedora 36 -(`fedora-36`), and Fedora 35 (`fedora-35`). There are also make targets for +(`centos-9`), CentOS 8 (`centos-8`), CentOS 7 (`centos-7`), Fedora 38 +(`fedora-38`), and Fedora 37 (`fedora-37`). There are also make targets for each subset of the container image kinds (`all`, `tool-data-sink`, `tool-meister`, `tools`, `workloads`, `base`) built for each distribution, e.g. `centos-8-tools-tagged`, `fedora-35-base-tagged`, etc. diff --git a/agent/rpm/Makefile b/agent/rpm/Makefile index bfe39b5795..5e5adf2c8a 100644 --- a/agent/rpm/Makefile +++ b/agent/rpm/Makefile @@ -24,7 +24,7 @@ CHROOTS = # target builds them all. RHEL_RPMS = rhel-9-rpm rhel-8-rpm rhel-7-rpm CENTOS_RPMS = centos-9-rpm centos-8-rpm centos-7-rpm -FEDORA_RPMS = fedora-38-rpm fedora-37-rpm fedora-36-rpm +FEDORA_RPMS = fedora-38-rpm fedora-37-rpm ALL_RPMS = ${RHEL_RPMS} ${CENTOS_RPMS} ${FEDORA_RPMS} component = agent diff --git a/agent/rpm/pbench-agent.spec.j2 b/agent/rpm/pbench-agent.spec.j2 index 40dae87f48..77e757a06b 100644 --- a/agent/rpm/pbench-agent.spec.j2 +++ b/agent/rpm/pbench-agent.spec.j2 @@ -68,11 +68,7 @@ Requires: python3-docutils %if 0%{?fedora} != 0 # RPMs for modules in requirements.txt Requires: python3-bottle, python3-click, python3-daemon -Requires: python3-jinja2, python3-redis, python3-sh -%endif - -%if 0%{?fedora} >= 36 -Requires: python3-ifaddr +Requires: python3-ifaddr python3-jinja2, python3-redis, python3-sh %endif # Common requirements diff --git a/contrib/containerized-pbench/pbench_demo b/contrib/containerized-pbench/pbench_demo index e009a31a32..015acf7a53 100755 --- a/contrib/containerized-pbench/pbench_demo +++ b/contrib/containerized-pbench/pbench_demo @@ -16,7 +16,7 @@ alias pbench="$(git rev-parse --show-toplevel)"/contrib/containerized-pbench/pbe FIOTEST=${PWD}/fiotest export PB_AGENT_PODMAN_OPTIONS="--pull newer -v ${FIOTEST}:/fiotest:z" -export PB_AGENT_IMAGE_NAME=quay.io/pbench/pbench-agent-all-fedora-36:main +export PB_AGENT_IMAGE_NAME=quay.io/pbench/pbench-agent-all-fedora-38:main mkdir -p "${FIOTEST}" diff --git a/jenkins/Makefile b/jenkins/Makefile index e17e7795eb..1e08295466 100644 --- a/jenkins/Makefile +++ b/jenkins/Makefile @@ -19,7 +19,7 @@ include ../utils/utils.mk # RPMs RPMBUILD_BASEIMAGE_DEFAULTS = \ rhel-9 rhel-8 rhel-7 \ - fedora-38 fedora-37 fedora-36 \ + fedora-38 fedora-37 \ centos-9 centos-8 centos-7 # All Fedora images are based on Fedora 36 diff --git a/jenkins/Pipeline.gy b/jenkins/Pipeline.gy index 93cd6355e1..6ae8d68b8e 100644 --- a/jenkins/Pipeline.gy +++ b/jenkins/Pipeline.gy @@ -65,7 +65,7 @@ pipeline { } stage('Build the Pbench Agent Containers') { environment { - PB_AGENT_DISTRO="fedora-36" + PB_AGENT_DISTRO="fedora-38" } steps { sh 'buildah login -u="${PB_CI_REG_CRED_USR}" -p="${PB_CI_REG_CRED_PSW}" ${PB_CI_REGISTRY}'