From be5a2ef9beb02a01f7c0567a0c268b04a733ae56 Mon Sep 17 00:00:00 2001 From: Mashhur Date: Fri, 13 Dec 2024 15:55:16 -0800 Subject: [PATCH 1/2] Generate noop CI step if next (is only available during the FF) is not available. --- .buildkite/scripts/build-pipeline/generate-steps.py | 2 +- .buildkite/scripts/e2e-pipeline/generate-steps.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/scripts/build-pipeline/generate-steps.py b/.buildkite/scripts/build-pipeline/generate-steps.py index bf74f560..b032dce0 100644 --- a/.buildkite/scripts/build-pipeline/generate-steps.py +++ b/.buildkite/scripts/build-pipeline/generate-steps.py @@ -42,7 +42,7 @@ def generate_steps_for_scheduler(versions) -> list: steps: list = [] snapshots = versions["snapshots"] for snapshot_version in snapshots: - if snapshots[snapshot_version].startswith("7."): + if snapshots[snapshot_version] is None or snapshots[snapshot_version].startswith("7."): continue full_stack_version = snapshots[snapshot_version] version_parts = snapshots[snapshot_version].split(".") diff --git a/.buildkite/scripts/e2e-pipeline/generate-steps.py b/.buildkite/scripts/e2e-pipeline/generate-steps.py index e9fc6166..3a6c30bd 100644 --- a/.buildkite/scripts/e2e-pipeline/generate-steps.py +++ b/.buildkite/scripts/e2e-pipeline/generate-steps.py @@ -38,7 +38,7 @@ def generate_steps_for_scheduler(versions) -> list: steps: list = [] snapshots = versions["snapshots"] for snapshot_version in snapshots: - if snapshots[snapshot_version].startswith("7."): + if snapshots[snapshot_version] is None or snapshots[snapshot_version].startswith("7."): continue full_stack_version = snapshots[snapshot_version] version_parts = snapshots[snapshot_version].split(".") From 332307f8860ca4aa27ecabe7e6954931e9dba79f Mon Sep 17 00:00:00 2001 From: Mashhur <99575341+mashhurs@users.noreply.github.com> Date: Fri, 13 Dec 2024 16:12:36 -0800 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Cas Donoghue --- .buildkite/scripts/build-pipeline/generate-steps.py | 2 +- .buildkite/scripts/e2e-pipeline/generate-steps.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/scripts/build-pipeline/generate-steps.py b/.buildkite/scripts/build-pipeline/generate-steps.py index b032dce0..048d7c7e 100644 --- a/.buildkite/scripts/build-pipeline/generate-steps.py +++ b/.buildkite/scripts/build-pipeline/generate-steps.py @@ -42,7 +42,7 @@ def generate_steps_for_scheduler(versions) -> list: steps: list = [] snapshots = versions["snapshots"] for snapshot_version in snapshots: - if snapshots[snapshot_version] is None or snapshots[snapshot_version].startswith("7."): + if snapshots.get(snapshot_version,"").startswith("7."): continue full_stack_version = snapshots[snapshot_version] version_parts = snapshots[snapshot_version].split(".") diff --git a/.buildkite/scripts/e2e-pipeline/generate-steps.py b/.buildkite/scripts/e2e-pipeline/generate-steps.py index 3a6c30bd..86514021 100644 --- a/.buildkite/scripts/e2e-pipeline/generate-steps.py +++ b/.buildkite/scripts/e2e-pipeline/generate-steps.py @@ -38,7 +38,7 @@ def generate_steps_for_scheduler(versions) -> list: steps: list = [] snapshots = versions["snapshots"] for snapshot_version in snapshots: - if snapshots[snapshot_version] is None or snapshots[snapshot_version].startswith("7."): + if snapshots.get(snapshot_version,"").startswith("7."): continue full_stack_version = snapshots[snapshot_version] version_parts = snapshots[snapshot_version].split(".")