From 04a79ed39a443bf4dc66ad9e4b5bae82db5c20d8 Mon Sep 17 00:00:00 2001
From: Yi Hu <yathu@google.com>
Date: Fri, 7 Apr 2023 12:32:44 -0400
Subject: [PATCH 1/2] Fix a couple of Python3.11 support followup

* Bump tenacity version for pull_license script support Py3.11

* Fix Sickbay test no task defined
---
 .../jenkins/job_PostCommit_Python_Sickbay.groovy     |  6 +++---
 .../jenkins/job_PreCommit_Portable_Python.groovy     |  2 +-
 build.gradle.kts                                     | 12 ------------
 sdks/java/container/license_scripts/requirement.txt  |  2 +-
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/.test-infra/jenkins/job_PostCommit_Python_Sickbay.groovy b/.test-infra/jenkins/job_PostCommit_Python_Sickbay.groovy
index 9789121ee77f..1aad5f9615d5 100644
--- a/.test-infra/jenkins/job_PostCommit_Python_Sickbay.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Python_Sickbay.groovy
@@ -19,10 +19,10 @@
 import CommonJobProperties as commonJobProperties
 import PostcommitJobBuilder
 
-import static PythonTestProperties.ALL_SUPPORTED_VERSIONS
+import static PythonTestProperties.ESSENTIAL_VERSIONS
 
 // This job defines the Python postcommit sickbay tests.
-ALL_SUPPORTED_VERSIONS.each { pythonVersion ->
+ESSENTIAL_VERSIONS.each { pythonVersion ->
   def versionSuffix = pythonVersion.replace('.', '')
   PostcommitJobBuilder.postCommitJob("beam_PostCommit_Sickbay_Python${versionSuffix}",
       "Run Python ${pythonVersion} PostCommit Sickbay",
@@ -40,7 +40,7 @@ ALL_SUPPORTED_VERSIONS.each { pythonVersion ->
         steps {
           gradle {
             rootBuildScriptDir(commonJobProperties.checkoutDir)
-            tasks(":python${versionSuffix}SickbayPostCommit")
+            tasks(":sdks:python:test-suites:dataflow:py${versionSuffix}:postCommitSickbay")
             commonJobProperties.setGradleSwitches(delegate)
           }
         }
diff --git a/.test-infra/jenkins/job_PreCommit_Portable_Python.groovy b/.test-infra/jenkins/job_PreCommit_Portable_Python.groovy
index 4c4491a3e0c2..2992cbbd0d06 100644
--- a/.test-infra/jenkins/job_PreCommit_Portable_Python.groovy
+++ b/.test-infra/jenkins/job_PreCommit_Portable_Python.groovy
@@ -52,7 +52,7 @@ builder.build {
     }
     gradle {
       rootBuildScriptDir(commonJobProperties.checkoutDir)
-      tasks(":sdks:python:test-suites:portable:${highestSupported}:preCommitPy${highestSupported}")
+      tasks(":sdks:python:test-suites:portable:py${highestSupported}:preCommitPy${highestSupported}")
       commonJobProperties.setGradleSwitches(delegate)
     }
   }
diff --git a/build.gradle.kts b/build.gradle.kts
index f94f16226320..613d4097b6be 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -535,18 +535,6 @@ tasks.register("python311PostCommit") {
   dependsOn(":sdks:python:test-suites:portable:py311:postCommitPy311")
 }
 
-task("python37SickbayPostCommit") {
-  dependsOn(":sdks:python:test-suites:dataflow:py37:postCommitSickbay")
-}
-
-task("python38SickbayPostCommit") {
-  dependsOn(":sdks:python:test-suites:dataflow:py38:postCommitSickbay")
-}
-
-task("python39SickbayPostCommit") {
-  dependsOn(":sdks:python:test-suites:dataflow:py39:postCommitSickbay")
-}
-
 tasks.register("portablePythonPreCommit") {
   dependsOn(":sdks:python:test-suites:portable:py37:preCommitPy37")
   dependsOn(":sdks:python:test-suites:portable:py311:preCommitPy311")
diff --git a/sdks/java/container/license_scripts/requirement.txt b/sdks/java/container/license_scripts/requirement.txt
index 954315cd0f99..d978cb27ef83 100644
--- a/sdks/java/container/license_scripts/requirement.txt
+++ b/sdks/java/container/license_scripts/requirement.txt
@@ -18,4 +18,4 @@
 
 beautifulsoup4>=4.9.0,<5.0
 pyyaml>=3.12,<6.0.0
-tenacity>=5.0.2,<6.0
+tenacity>=6.1.0,<9.0

From 3b89bb5093d68699ab2020949933f8bd6f5d6522 Mon Sep 17 00:00:00 2001
From: Yi Hu <yathu@google.com>
Date: Fri, 7 Apr 2023 13:38:58 -0400
Subject: [PATCH 2/2] Still Run ALL_SUPPORTED_VERSIONS For Python Sickbay

---
 .test-infra/jenkins/job_PostCommit_Python_Sickbay.groovy | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.test-infra/jenkins/job_PostCommit_Python_Sickbay.groovy b/.test-infra/jenkins/job_PostCommit_Python_Sickbay.groovy
index 1aad5f9615d5..1122db78c9c8 100644
--- a/.test-infra/jenkins/job_PostCommit_Python_Sickbay.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Python_Sickbay.groovy
@@ -19,10 +19,10 @@
 import CommonJobProperties as commonJobProperties
 import PostcommitJobBuilder
 
-import static PythonTestProperties.ESSENTIAL_VERSIONS
+import static PythonTestProperties.ALL_SUPPORTED_VERSIONS
 
 // This job defines the Python postcommit sickbay tests.
-ESSENTIAL_VERSIONS.each { pythonVersion ->
+ALL_SUPPORTED_VERSIONS.each { pythonVersion ->
   def versionSuffix = pythonVersion.replace('.', '')
   PostcommitJobBuilder.postCommitJob("beam_PostCommit_Sickbay_Python${versionSuffix}",
       "Run Python ${pythonVersion} PostCommit Sickbay",