From 3997c2ded9d04fc591b3bd70b22e4ee991c9c67b Mon Sep 17 00:00:00 2001 From: Hanwen Date: Thu, 10 Oct 2024 11:43:15 -0700 Subject: [PATCH 1/2] [Github workflow] Fix Slurmdbd tempate Github check by pinning typeguard version An upgrade in AWS CDK dependencies started to use typeguard 4.x, which is failing the template generation. Example failure: https://github.com/aws/aws-parallelcluster/actions/runs/11257806474/job/31369657650?pr=6454 Signed-off-by: Hanwen --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 94be047f96..aa9f635263 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -202,6 +202,7 @@ jobs: python-version: '3.12' - name: Install AWS CDK run: | + pip install typeguard~=2.13 npm install -g aws-cdk pip install -r cloudformation/external-slurmdbd/requirements.txt - working-directory: cloudformation/external-slurmdbd From 89873ed2687e8364df33c663862c1a40fb782d38 Mon Sep 17 00:00:00 2001 From: Hanwen Date: Fri, 11 Oct 2024 06:44:36 -0700 Subject: [PATCH 2/2] Reapply "Pin jsonschema for Lambda Layer to version 4.17.3" This reverts commit 9277bda130c2314b6c5bfa6db2085923c66a0f36. --- tests/integration-tests/conftest_resource_bucket.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/integration-tests/conftest_resource_bucket.py b/tests/integration-tests/conftest_resource_bucket.py index bb0ab1f9bc..954d1ddc6e 100644 --- a/tests/integration-tests/conftest_resource_bucket.py +++ b/tests/integration-tests/conftest_resource_bucket.py @@ -40,7 +40,9 @@ def install_pc(basepath, pc_version): cli_dir = root / "cli" try: logger.info("installing ParallelCluster packages...") - subprocess.check_call([sys.executable, "-m", "pip", "install", f"{cli_dir}[awslambda]", "-t", tempdir]) + subprocess.check_call( + [sys.executable, "-m", "pip", "install", "jsonschema==4.17.3", f"{cli_dir}[awslambda]", "-t", tempdir] + ) # The following are provided by the lambda runtime shutil.rmtree(tempdir / "botocore") shutil.rmtree(tempdir / "boto3")