Skip to content

Commit

Permalink
kOps: most jobs should use latest-ci-updown-green.txt
Browse files Browse the repository at this point in the history 
Other than the jobs that publish latest-ci-updown-green.txt (or
latest-ci.txt), we should be using the latest-ci-updown-green marker;
this marker indicates a version that has passed CI (unit tests) and a
smoke test (bringing a cluster up and down).

Co-authored-by: Ciprian Hacman <[email protected]>
  • Loading branch information
@justinsb @hakman
justinsb and hakman committed Jul 27, 2024
1 parent cb0886d commit f9b403a
Showing 1 changed file with 28 additions and 20 deletions.
48 changes: 28 additions & 20 deletions config/jobs/kubernetes/kops/build_jobs.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,14 @@

loader = jinja2.FileSystemLoader(searchpath="./templates")

# A helper function to construct the URLs to our marker files
def marker_updown_green(kops_version):
base_url = "https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers"
marker_file = "latest-ci-updown-green.txt"
if kops_version is None:
return f"{base_url}/master/{marker_file}"
return f"{base_url}/release-{kops_version}/{marker_file}"

##############
# Build Test #
##############
Expand Down Expand Up @@ -71,12 +79,12 @@ def build_test(cloud='aws',
storage_e2e_cred=False):
# pylint: disable=too-many-statements,too-many-branches,too-many-arguments
if kops_version is None:
kops_deploy_url = "https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci.txt"
kops_deploy_url = marker_updown_green(None)
elif kops_version.startswith("https://"):
kops_deploy_url = kops_version
kops_version = None
else:
kops_deploy_url = f"https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-{kops_version}/latest-ci.txt"
kops_deploy_url = marker_updown_green(kops_version)

if should_skip_newer_k8s(k8s_version, kops_version):
return None
Expand Down Expand Up @@ -736,7 +744,7 @@ def generate_misc():
distro="u2204arm64",
networking="calico",
kops_channel="alpha",
kops_version="https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci.txt",
kops_version=marker_updown_green("master"),
publish_version_marker="gs://k8s-staging-kops/kops/releases/markers/master/latest-ci.txt",
runs_per_day=24,
focus_regex=r'\[k8s.io\]\sNetworking.*\[Conformance\]',
Expand Down Expand Up @@ -940,7 +948,7 @@ def generate_misc():
distro="cos105",
networking="kubenet",
k8s_version="ci",
kops_version="https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci.txt",
kops_version=marker_updown_green("master"),
kops_channel="alpha",
extra_flags=[
"--image=cos-cloud/cos-105-17412-370-67",
Expand All @@ -957,7 +965,7 @@ def generate_misc():
distro="al2023",
networking="kubenet",
k8s_version="ci",
kops_version="https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci.txt",
kops_version=marker_updown_green("master"),
kops_channel="alpha",
extra_flags=[
"--set=spec.nodeProblemDetector.enabled=true",
Expand All @@ -973,7 +981,7 @@ def generate_misc():
distro="u2204",
networking="kubenet",
k8s_version="ci",
kops_version="https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci.txt",
kops_version=marker_updown_green("master"),
kops_channel="alpha",
extra_flags=[
"--set=spec.nodeProblemDetector.enabled=true",
Expand All @@ -990,7 +998,7 @@ def generate_misc():
distro="cos105",
networking="kubenet",
k8s_version="ci",
kops_version="https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci.txt",
kops_version=marker_updown_green("master"),
kops_channel="alpha",
extra_flags=[
"--image=cos-cloud/cos-105-17412-370-67",
Expand All @@ -1008,7 +1016,7 @@ def generate_misc():
distro="al2023",
networking="kubenet",
k8s_version="ci",
kops_version="https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci.txt",
kops_version=marker_updown_green("master"),
kops_channel="alpha",
build_cluster="k8s-infra-prow-build",
extra_flags=[
Expand All @@ -1025,7 +1033,7 @@ def generate_misc():
distro="cos105",
networking="kubenet",
k8s_version="ci",
kops_version="https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci.txt",
kops_version=marker_updown_green("master"),
kops_channel="alpha",
extra_flags=[
"--image=cos-cloud/cos-105-17412-370-67",
Expand All @@ -1047,7 +1055,7 @@ def generate_misc():
distro="al2023",
networking="kubenet",
k8s_version="ci",
kops_version="https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci.txt",
kops_version=marker_updown_green("master"),
kops_channel="alpha",
build_cluster="eks-prow-build-cluster",
extra_flags=[
Expand All @@ -1068,7 +1076,7 @@ def generate_misc():
distro="al2023",
networking="amazonvpc",
k8s_version="stable",
kops_version="https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci.txt",
kops_version=marker_updown_green("master"),
cluster_name="kubernetes-e2e-al2023-aws-conformance-aws-cni.k8s.local",
kops_channel="alpha",
build_cluster="eks-prow-build-cluster",
Expand All @@ -1095,7 +1103,7 @@ def generate_misc():
distro="al2023",
networking="amazonvpc",
k8s_version="ci",
kops_version="https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci.txt",
kops_version=marker_updown_green("master"),
cluster_name="kubernetes-e2e-al2023-aws-conformance-aws-cni-canary.k8s.local",
kops_channel="alpha",
build_cluster="k8s-infra-prow-build",
Expand All @@ -1122,7 +1130,7 @@ def generate_misc():
distro="al2023",
networking="cilium",
k8s_version="ci",
kops_version="https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci.txt",
kops_version=marker_updown_green("master"),
cluster_name="kubernetes-e2e-al2023-aws-conformance-cilium.k8s.local",
kops_channel="alpha",
build_cluster="k8s-infra-prow-build",
Expand All @@ -1147,7 +1155,7 @@ def generate_misc():
distro="cos105",
networking="kubenet",
k8s_version="ci",
kops_version="https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci.txt",
kops_version=marker_updown_green("master"),
kops_channel="alpha",
extra_flags=[
"--image=cos-cloud/cos-105-17412-370-67",
Expand All @@ -1166,7 +1174,7 @@ def generate_misc():
distro="cos105",
networking="gce",
k8s_version="ci",
kops_version="https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci.txt",
kops_version=marker_updown_green("master"),
kops_channel="alpha",
extra_flags=[
"--image=cos-cloud/cos-105-17412-370-67",
Expand All @@ -1185,7 +1193,7 @@ def generate_misc():
distro="al2023",
networking="kubenet",
k8s_version="ci",
kops_version="https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci.txt",
kops_version=marker_updown_green("master"),
kops_channel="alpha",
build_cluster="k8s-infra-prow-build",
focus_regex=r'\[Disruptive\]',
Expand All @@ -1200,7 +1208,7 @@ def generate_misc():
distro="cos105",
networking="kubenet",
k8s_version="ci",
kops_version="https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci.txt",
kops_version=marker_updown_green("master"),
kops_channel="alpha",
extra_flags=[
"--image=cos-cloud/cos-105-17412-370-67",
Expand All @@ -1220,7 +1228,7 @@ def generate_misc():
distro="al2023",
networking="kubenet",
k8s_version="ci",
kops_version="https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci.txt",
kops_version=marker_updown_green("master"),
kops_channel="alpha",
build_cluster="k8s-infra-prow-build",
extra_flags=[
Expand All @@ -1240,7 +1248,7 @@ def generate_misc():
distro="al2023",
networking="kubenet",
k8s_version="ci",
kops_version="https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci.txt",
kops_version=marker_updown_green("master"),
kops_channel="alpha",
build_cluster="k8s-infra-prow-build",
extra_flags=[
Expand All @@ -1263,7 +1271,7 @@ def generate_misc():
distro="cos105",
networking="kubenet",
k8s_version="ci",
kops_version="https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci.txt",
kops_version=marker_updown_green("master"),
kops_channel="alpha",
extra_flags=[
"--image=cos-cloud/cos-105-17412-370-67",
Expand Down

0 comments on commit f9b403a

Please sign in to comment.