diff --git a/.github/actions/setup-gradle/action.yml b/.github/actions/setup-gradle/action.yml index 1a5b0902703ab..fe456568066e6 100644 --- a/.github/actions/setup-gradle/action.yml +++ b/.github/actions/setup-gradle/action.yml @@ -37,7 +37,7 @@ runs: using: "composite" steps: - name: Setup Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: temurin java-version: ${{ inputs.java-version }} diff --git a/.github/actions/setup-python/action.yml b/.github/actions/setup-python/action.yml index d7e326314c1be..10c55f6e083b5 100644 --- a/.github/actions/setup-python/action.yml +++ b/.github/actions/setup-python/action.yml @@ -22,7 +22,7 @@ runs: using: "composite" steps: - name: Setup Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: 3.12 - name: Pip install diff --git a/.github/scripts/requirements.txt b/.github/scripts/requirements.txt index d59455f79dac6..d3fcf50bb7400 100644 --- a/.github/scripts/requirements.txt +++ b/.github/scripts/requirements.txt @@ -12,6 +12,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + +# Note: Ensure the 'requests' version here matches the version in tests/setup.py PyYAML~=6.0 pytz==2024.2 -requests==2.32.3 +requests==2.32.4 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5137f8bf37292..47bb2cbc31d5d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,12 +66,12 @@ jobs: name: Load Test Catalog steps: - name: Checkout main - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: persist-credentials: false - name: Checkout test-catalog - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: ref: 'test-catalog' persist-credentials: false @@ -118,7 +118,7 @@ jobs: env: GITHUB_CONTEXT: ${{ toJson(github) }} - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: persist-credentials: false ref: ${{ github.sha }} # this is the default, just being explicit. @@ -192,7 +192,7 @@ jobs: name: JUnit tests Java ${{ matrix.java }}${{ matrix.run-flaky == true && ' (flaky)' || '' }}${{ matrix.run-new == true && ' (new)' || '' }} steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: persist-credentials: false ref: ${{ needs.configure.outputs.sha }} @@ -210,7 +210,7 @@ jobs: # the overall workflow, so we'll continue here without a test catalog. - name: Load Test Catalog id: load-test-catalog - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v5 continue-on-error: true with: name: combined-test-catalog @@ -282,11 +282,11 @@ jobs: uploaded-test-catalog: ${{ steps.archive-test-catalog.outcome == 'success' }} steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: persist-credentials: false - name: Download Thread Dumps - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v5 with: pattern: junit-thread-dumps-24-* path: thread-dumps @@ -300,7 +300,7 @@ jobs: exit 1; fi - name: Download JUnit XMLs - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v5 with: pattern: junit-xml-24-* # Only look at JDK 24 tests for the test catalog path: junit-xml @@ -334,7 +334,7 @@ jobs: contents: write steps: - name: Checkout Test Catalog - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: persist-credentials: true # Needed to commit and push later ref: test-catalog @@ -342,7 +342,7 @@ jobs: run: | rm -rf test-catalog - name: Download Test Catalog - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v5 with: name: test-catalog path: test-catalog diff --git a/.github/workflows/ci-complete.yml b/.github/workflows/ci-complete.yml index 44d4f5a9c1d62..6b8492fb7c0ab 100644 --- a/.github/workflows/ci-complete.yml +++ b/.github/workflows/ci-complete.yml @@ -61,7 +61,7 @@ jobs: env: GITHUB_CONTEXT: ${{ toJson(github) }} - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: persist-credentials: false @@ -72,7 +72,7 @@ jobs: develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }} - name: Download build scan archive id: download-build-scan - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v5 continue-on-error: true # Don't want this step to fail the overall workflow with: github-token: ${{ github.token }} diff --git a/.github/workflows/deflake.yml b/.github/workflows/deflake.yml index f58408a04739d..3a2fbb56345b2 100644 --- a/.github/workflows/deflake.yml +++ b/.github/workflows/deflake.yml @@ -42,7 +42,7 @@ jobs: name: Deflake JUnit tests steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: persist-credentials: false diff --git a/.github/workflows/docker_build_and_test.yml b/.github/workflows/docker_build_and_test.yml index 67acdf9fb7424..6a1b2f7de25f1 100644 --- a/.github/workflows/docker_build_and_test.yml +++ b/.github/workflows/docker_build_and_test.yml @@ -32,9 +32,9 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Set up Python 3.10 - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: "3.10" - name: Setup Docker Compose diff --git a/.github/workflows/docker_official_image_build_and_test.yml b/.github/workflows/docker_official_image_build_and_test.yml index 58866a19d6cab..1580ea1f744ba 100644 --- a/.github/workflows/docker_official_image_build_and_test.yml +++ b/.github/workflows/docker_official_image_build_and_test.yml @@ -31,9 +31,9 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Set up Python 3.10 - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: "3.10" - name: Setup Docker Compose diff --git a/.github/workflows/docker_rc_release.yml b/.github/workflows/docker_rc_release.yml index 1f824b39b977a..da851f4a43028 100644 --- a/.github/workflows/docker_rc_release.yml +++ b/.github/workflows/docker_rc_release.yml @@ -37,9 +37,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Set up Python 3.10 - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: "3.10" - name: Install dependencies diff --git a/.github/workflows/generate-reports.yml b/.github/workflows/generate-reports.yml index a3ae34fcecb80..dee7094c27c15 100644 --- a/.github/workflows/generate-reports.yml +++ b/.github/workflows/generate-reports.yml @@ -32,7 +32,7 @@ jobs: env: GITHUB_CONTEXT: ${{ toJson(github) }} - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup Python uses: ./.github/actions/setup-python - name: Run Report diff --git a/.github/workflows/pr-labeled.yml b/.github/workflows/pr-labeled.yml index 87b39a659ec0c..b5695825861ff 100644 --- a/.github/workflows/pr-labeled.yml +++ b/.github/workflows/pr-labeled.yml @@ -35,7 +35,7 @@ jobs: env: GITHUB_CONTEXT: ${{ toJson(github) }} - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: persist-credentials: false diff --git a/.github/workflows/pr-linter.yml b/.github/workflows/pr-linter.yml index f19efbfabe2c1..d38a9659a01f9 100644 --- a/.github/workflows/pr-linter.yml +++ b/.github/workflows/pr-linter.yml @@ -31,12 +31,12 @@ jobs: env: GITHUB_CONTEXT: ${{ toJson(github) }} - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: persist-credentials: false - name: Load PR Number id: load-pr-number - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v5 with: github-token: ${{ github.token }} run-id: ${{ github.event.workflow_run.id }} diff --git a/.github/workflows/pr-update.yml b/.github/workflows/pr-update.yml index e1cd7214d6c36..7b45a15d19126 100644 --- a/.github/workflows/pr-update.yml +++ b/.github/workflows/pr-update.yml @@ -37,8 +37,8 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v4 - - uses: actions/labeler@v5 + uses: actions/checkout@v5 + - uses: actions/labeler@v6 with: configuration-path: .github/configs/labeler.yml - name: check small label diff --git a/.github/workflows/prepare_docker_official_image_source.yml b/.github/workflows/prepare_docker_official_image_source.yml index 32f21a0afd0bf..82204b9b93597 100644 --- a/.github/workflows/prepare_docker_official_image_source.yml +++ b/.github/workflows/prepare_docker_official_image_source.yml @@ -31,9 +31,9 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Set up Python 3.10 - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: "3.10" - name: Install dependencies diff --git a/.github/workflows/workflow-requested.yml b/.github/workflows/workflow-requested.yml index 6463c72ab0acc..aae00f9ece7b0 100644 --- a/.github/workflows/workflow-requested.yml +++ b/.github/workflows/workflow-requested.yml @@ -38,7 +38,7 @@ jobs: env: GITHUB_CONTEXT: ${{ toJson(github) }} - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: persist-credentials: false diff --git a/tests/setup.py b/tests/setup.py index dcb023a32b949..9806188011d83 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -40,6 +40,7 @@ def run(self): sys.exit(errno) # Note: when changing the version of ducktape, also revise tests/docker/Dockerfile +# Ensure the 'requests' version here matches the one specified in .github/scripts/requirements.txt setup(name="kafkatest", version=version, description="Apache Kafka System Tests",