From 20a2aa4fc3e11d65eca60976feab8199d4658206 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 24 Jul 2023 14:59:32 +0200
Subject: [PATCH] [8.7](backport #36091) Pin PyYAML version to 5.3.1 to avoid
 CI errors temporarily (#36141)

* Pin PyYAML version to 5.3.1 to avoid CI errors temporarily (#36091)

CPython 3.0 was released recently which appears to have introduced a regression that leads to failures when installing PyYAML (and perhaps other packages too). This is a temporary fix and this commits needs to be reverted when a proper fix is available.

(cherry picked from commit 46adbacfb5a89a02c025b11a66a6e5dbbaf4514a)

# Conflicts:
#	libbeat/tests/system/requirements.txt
#	libbeat/tests/system/requirements_aix.txt
#	metricbeat/Dockerfile

* Update requirements.txt

* Update requirements_aix.txt

* Update CHANGELOG-developer.next.asciidoc

* Update Dockerfile

---------

Co-authored-by: subham sarkar <subham.sarkar@elastic.co>
Co-authored-by: Pierre HILBERT <pierre.hilbert@elastic.co>
---
 CHANGELOG-developer.next.asciidoc                               | 1 +
 libbeat/tests/system/requirements.txt                           | 2 +-
 libbeat/tests/system/requirements_aix.txt                       | 2 +-
 metricbeat/Dockerfile                                           | 1 +
 .../module/kubernetes/_meta/terraform/eks/requirements.txt      | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG-developer.next.asciidoc b/CHANGELOG-developer.next.asciidoc
index 46240800913..5a22a1fc702 100644
--- a/CHANGELOG-developer.next.asciidoc
+++ b/CHANGELOG-developer.next.asciidoc
@@ -151,6 +151,7 @@ The list below covers the major changes between 7.0.0-rc2 and main only.
 - Add an option to disable event normalization when creating a `beat.Client`. {pull}33657[33657]
 - Add the file path of the instance lock on the error when it's is already locked {pull}33788[33788]
 - Add DropFields processor to js API {pull}33458[33458]
+- Pin PyYAML version to 5.3.1 to avoid CI errors temporarily {pull}36091[36091]
 
 ==== Deprecated
 
diff --git a/libbeat/tests/system/requirements.txt b/libbeat/tests/system/requirements.txt
index f2bc5aa3de8..196a576555a 100644
--- a/libbeat/tests/system/requirements.txt
+++ b/libbeat/tests/system/requirements.txt
@@ -37,7 +37,7 @@ pytest==7.1.3
 pytest-otel==1.3.0
 pytest-rerunfailures==9.1.1
 pytest-timeout==1.4.2
-PyYAML==5.4.1
+PyYAML==5.3.1
 redis==2.10.6
 requests==2.28.2
 semver==2.8.1
diff --git a/libbeat/tests/system/requirements_aix.txt b/libbeat/tests/system/requirements_aix.txt
index 1e01508f0ef..ee522b1ab45 100644
--- a/libbeat/tests/system/requirements_aix.txt
+++ b/libbeat/tests/system/requirements_aix.txt
@@ -36,7 +36,7 @@ pytest==7.1.3
 pytest-otel==1.3.0
 pytest-rerunfailures==9.1.1
 pytest-timeout==1.4.2
-PyYAML==5.4.1
+PyYAML==5.3.1
 redis==2.10.6
 requests==2.25.1
 semver==2.8.1
diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile
index be52fe79991..d8399210f48 100644
--- a/metricbeat/Dockerfile
+++ b/metricbeat/Dockerfile
@@ -15,6 +15,7 @@ RUN \
 RUN pip3 install --upgrade pip==20.1.1
 RUN pip3 install --upgrade setuptools==47.3.2
 RUN pip3 install --upgrade docker-compose==1.23.2
+RUN pip3 install --upgrade PyYAML==5.3.1
 
 # Oracle instant client
 RUN cd /usr/lib \
diff --git a/metricbeat/module/kubernetes/_meta/terraform/eks/requirements.txt b/metricbeat/module/kubernetes/_meta/terraform/eks/requirements.txt
index 2f67d6aad45..57d386ba6a0 100644
--- a/metricbeat/module/kubernetes/_meta/terraform/eks/requirements.txt
+++ b/metricbeat/module/kubernetes/_meta/terraform/eks/requirements.txt
@@ -5,7 +5,7 @@ docutils==0.15.2
 jmespath==0.9.5
 pyasn1==0.4.8
 python-dateutil==2.8.1
-PyYAML==5.4.1
+PyYAML==5.3.1
 rsa==4.7.2
 s3transfer==0.3.3
 six==1.14.0