[7.17](backport #36091) Pin PyYAML version to 5.3.1 to avoid CI error…

…s temporarily (#36093) * 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 46adbac) # Conflicts: # libbeat/tests/system/requirements.txt # libbeat/tests/system/requirements_aix.txt * Resolve conflicts --------- Co-authored-by: subham sarkar <subham.sarkar@elastic.co> Co-authored-by: Denis Rechkunov <denis.rechkunov@elastic.co>
elastic · Jul 18, 2023 · ed99337 · ed99337
1 parent 14aef55
commit ed99337
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG-developer.next.asciidoc b/CHANGELOG-developer.next.asciidoc
@@ -121,6 +121,7 @@ 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]
+- Pin PyYAML version to 5.3.1 to avoid CI errors temporarily {pull}36091[36091]
 
 ==== Deprecated
 

diff --git a/filebeat/Dockerfile b/filebeat/Dockerfile
@@ -20,4 +20,4 @@ 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 PyYAML==6.0.0
+RUN pip3 install --upgrade PyYAML==5.3.1
diff --git a/libbeat/tests/system/requirements.txt b/libbeat/tests/system/requirements.txt
@@ -36,7 +36,7 @@ pyrsistent==0.16.0
 pytest==7.3.2
 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/libbeat/tests/system/requirements_aix.txt b/libbeat/tests/system/requirements_aix.txt
@@ -35,7 +35,7 @@ pyrsistent==0.16.0
 pytest==7.3.2
 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
@@ -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
@@ -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