From 509f97a8f5eeefbc8f49b0ebbb42ddb8754e6e82 Mon Sep 17 00:00:00 2001
From: subham sarkar <subham.sarkar@elastic.co>
Date: Tue, 18 Jul 2023 12:22:35 +0530
Subject: [PATCH] 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
---
 CHANGELOG-developer.next.asciidoc                    | 12 ++++++++++++
 libbeat/tests/system/requirements.txt                |  6 ++++++
 libbeat/tests/system/requirements_aix.txt            |  6 ++++++
 metricbeat/Dockerfile                                |  2 +-
 .../kubernetes/_meta/terraform/eks/requirements.txt  |  2 +-
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG-developer.next.asciidoc b/CHANGELOG-developer.next.asciidoc
index ebd6e262039..451e980130b 100644
--- a/CHANGELOG-developer.next.asciidoc
+++ b/CHANGELOG-developer.next.asciidoc
@@ -121,6 +121,18 @@ The list below covers the major changes between 7.0.0-rc2 and master only.
 - Whitelist `GCP_*` environment variables in dev tools {pull}28364[28364]
 - Improve tests files with shorter statements. {pull}35667[35667]
 - Improve compatibility and reduce flakyness of Python tests {pull}31588[31588]
+- Added `.python-version` file {pull}32323[32323]
+- Use `T.TempDir` to create temporary test directory {pull}33082[33082]
+- 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]
+- Add support for different folders when testing data {pull}34467[34467]
+- Add logging of metric registration in inputmon. {pull}35647[35647]
+- Add Okta API package for entity analytics. {pull}35478[35478]
+- Add benchmarking to HTTPJSON input testing. {pull}35138[35138]
+- Allow non-AWS endpoints for testing Filebeat awss3 input. {issue}35496[35496] {pull}35520[35520]
+- Add AUTH (username) and SSL/TLS support for Redis module {pull}35240[35240]
+- 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 e03ece93c66..e1a7db25b31 100644
--- a/libbeat/tests/system/requirements.txt
+++ b/libbeat/tests/system/requirements.txt
@@ -36,9 +36,15 @@ pyrsistent==0.16.0
 pytest==7.3.2
 pytest-rerunfailures==9.1.1
 pytest-timeout==1.4.2
+<<<<<<< HEAD
 PyYAML==5.4.1
 redis==2.10.6
 requests==2.25.1
+=======
+PyYAML==5.3.1
+redis==4.4.4
+requests==2.31.0
+>>>>>>> 46adbacfb5 (Pin PyYAML version to 5.3.1 to avoid CI errors temporarily (#36091))
 semver==2.8.1
 setuptools==47.3.2
 six==1.15.0
diff --git a/libbeat/tests/system/requirements_aix.txt b/libbeat/tests/system/requirements_aix.txt
index b6857276c62..831eee912a4 100644
--- a/libbeat/tests/system/requirements_aix.txt
+++ b/libbeat/tests/system/requirements_aix.txt
@@ -35,9 +35,15 @@ pyrsistent==0.16.0
 pytest==7.3.2
 pytest-rerunfailures==9.1.1
 pytest-timeout==1.4.2
+<<<<<<< HEAD
 PyYAML==5.4.1
 redis==2.10.6
 requests==2.25.1
+=======
+PyYAML==5.3.1
+redis==4.4.4
+requests==2.31.0
+>>>>>>> 46adbacfb5 (Pin PyYAML version to 5.3.1 to avoid CI errors temporarily (#36091))
 semver==2.8.1
 setuptools==47.3.2
 six==1.15.0
diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile
index f1b45388bd9..496a1c8835d 100644
--- a/metricbeat/Dockerfile
+++ b/metricbeat/Dockerfile
@@ -19,7 +19,7 @@ ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 RUN pip3 install --upgrade pip==20.1.1
 RUN pip3 install --upgrade docker-compose==1.23.2
 RUN pip3 install --upgrade setuptools==47.3.2
-RUN pip3 install --upgrade PyYAML==6.0.0
+RUN pip3 install --upgrade PyYAML==5.3.1
 
 # Add healthcheck for the docker/healthcheck metricset to check during testing.
 HEALTHCHECK CMD exit 0
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