Merge pull request #35816 from upodroid/fix-kops-jobs

fix kops jobs that fail to launch - one

Author: k8s-ci-robot

config/jobs/kubernetes/kops/build_jobs.py

@@ -1341,11 +1341,11 @@ def generate_misc():
 ################################
 def generate_conformance():
     results = []
-    for version in ['1.35', '1.34', '1.33', '1.32', '1.31']:
+    for version in ['master', '1.34', '1.33', '1.32']:
         results.append(
             build_test(
                 cloud='aws',
-                k8s_version=version,
+                k8s_version=version.replace('master', 'ci'),
                 kops_version=version,
                 kops_channel='alpha',
                 name_override=f"kops-aws-conformance-{version.replace('.', '-')}",
@@ -1365,7 +1365,7 @@ def generate_conformance():
         results.append(
             build_test(
                 cloud='aws',
-                k8s_version=version,
+                k8s_version=version.replace('master', 'ci'),
                 kops_version=version,
                 kops_channel='alpha',
                 name_override=f"kops-aws-conformance-arm64-{version.replace('.', '-')}",
@@ -1841,17 +1841,17 @@ def generate_versions():
 ######################
 def generate_pipeline():
     results = []
-    for version in ['master', '1.35', '1.34', '1.33', '1.32', '1.31']:
+    for version in ['master', '1.34', '1.33', '1.32']:
         branch = version if version == 'master' else f"release-{version}"
         publish_version_marker = f"gs://k8s-staging-kops/kops/releases/markers/{branch}/latest-ci-updown-green.txt"
         kops_version = f"https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/{branch}/latest-ci.txt"
         results.append(
             build_test(
                 cloud="aws",
-                k8s_version=version.replace('master', 'stable'),
+                k8s_version=version.replace('master', 'ci'),
                 kops_version=kops_version,
                 kops_channel='alpha',
-                name_override=f"kops-pipeline-updown-kops{version.replace('.', '')}",
+                name_override=f"kops-pipeline-updown-kops-{version.replace('.', '')}",
                 networking='calico',
                 extra_dashboards=['kops-versions'],
                 runs_per_day=24,

config/jobs/kubernetes/kops/helpers.py

@@ -70,6 +70,8 @@ def replace_or_remove_line(s, pattern, new_str):
     return '\n'.join(keep)
 
 def should_skip_newer_k8s(k8s_version, kops_version):
+    if k8s_version == 'ci':
+        return False
     if kops_version is None:
         return False
     if k8s_version is None:

config/jobs/kubernetes/kops/kops-periodics-conformance.yaml

@@ -1,10 +1,10 @@
 # Test jobs generated by build_jobs.py (do not manually edit)
-# 10 jobs, total of 70 runs per week
+# 8 jobs, total of 56 runs per week
 periodics:
 
-# {"cloud": "aws", "distro": "u2404", "extra_flags": "--zones=eu-central-1a --node-size=t3.large --master-size=t3.large", "k8s_version": "1.35", "kops_channel": "alpha", "kops_version": "1.35", "networking": "calico"}
-- name: e2e-kops-aws-conformance-1-35
-  cron: '45 7-23/24 * * *'
+# {"cloud": "aws", "distro": "u2404", "extra_flags": "--zones=eu-central-1a --node-size=t3.large --master-size=t3.large", "k8s_version": "ci", "kops_channel": "alpha", "kops_version": "master", "networking": "calico"}
+- name: e2e-kops-aws-conformance-master
+  cron: '4 2-23/24 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -33,12 +33,14 @@ periodics:
           --up --down \
           --cloud-provider=aws \
           --create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20251001' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t3.large --master-size=t3.large" \
-          --kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-1.35/latest-ci-updown-green.txt \
-          --kubernetes-version=https://dl.k8s.io/release/stable-1.35.txt \
+          --kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
           --test=kops \
           -- \
           --test-args="-test.timeout=150m" \
-          --test-package-marker=stable-1.35.txt \
+          --test-package-url=https://storage.googleapis.com/k8s-release-dev \
+          --test-package-dir=ci \
+          --test-package-marker=latest.txt \
           --focus-regex="\[Conformance\]" \
           --skip-regex="\[NoSkip\]" \
           --parallel=1
@@ -60,17 +62,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/distro: u2404
     test.kops.k8s.io/extra_flags: --zones=eu-central-1a --node-size=t3.large --master-size=t3.large
-    test.kops.k8s.io/k8s_version: '1.35'
+    test.kops.k8s.io/k8s_version: ci
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.35'
+    test.kops.k8s.io/kops_version: master
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: conformance-all, kops-1.35, kops-conformance, kops-distro-u2404, kops-k8s-1.35, sig-cluster-lifecycle-kops
+    testgrid-dashboards: conformance-all, kops-conformance, kops-distro-u2404, kops-k8s-ci, kops-master, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-aws-conformance-1-35
+    testgrid-tab-name: kops-aws-conformance-master
 
-# {"cloud": "aws", "distro": "u2404arm64", "extra_flags": "--zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large", "k8s_version": "1.35", "kops_channel": "alpha", "kops_version": "1.35", "networking": "calico"}
-- name: e2e-kops-aws-conformance-arm64-1-35
-  cron: '51 12-23/24 * * *'
+# {"cloud": "aws", "distro": "u2404arm64", "extra_flags": "--zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large", "k8s_version": "ci", "kops_channel": "alpha", "kops_version": "master", "networking": "calico"}
+- name: e2e-kops-aws-conformance-arm64-master
+  cron: '44 4-23/24 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -99,12 +101,14 @@ periodics:
           --up --down \
           --cloud-provider=aws \
           --create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20251001' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large" \
-          --kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-1.35/latest-ci-updown-green.txt \
-          --kubernetes-version=https://dl.k8s.io/release/stable-1.35.txt \
+          --kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
           --test=kops \
           -- \
           --test-args="-test.timeout=150m" \
-          --test-package-marker=stable-1.35.txt \
+          --test-package-url=https://storage.googleapis.com/k8s-release-dev \
+          --test-package-dir=ci \
+          --test-package-marker=latest.txt \
           --focus-regex="\[Conformance\]" \
           --skip-regex="\[NoSkip\]" \
           --parallel=1
@@ -126,13 +130,13 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/distro: u2404arm64
     test.kops.k8s.io/extra_flags: --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large
-    test.kops.k8s.io/k8s_version: '1.35'
+    test.kops.k8s.io/k8s_version: ci
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.35'
+    test.kops.k8s.io/kops_version: master
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: conformance-all, conformance-arm64, kops-1.35, kops-conformance, kops-distro-u2404, kops-k8s-1.35, sig-cluster-lifecycle-kops
+    testgrid-dashboards: conformance-all, conformance-arm64, kops-conformance, kops-distro-u2404, kops-k8s-ci, kops-master, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-aws-conformance-arm64-1-35
+    testgrid-tab-name: kops-aws-conformance-arm64-master
 
 # {"cloud": "aws", "distro": "u2404", "extra_flags": "--zones=eu-central-1a --node-size=t3.large --master-size=t3.large", "k8s_version": "1.34", "kops_channel": "alpha", "kops_version": "1.34", "networking": "calico"}
 - name: e2e-kops-aws-conformance-1-34
@@ -529,135 +533,3 @@ periodics:
     testgrid-dashboards: conformance-all, conformance-arm64, kops-1.32, kops-conformance, kops-distro-u2404, kops-k8s-1.32, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
     testgrid-tab-name: kops-aws-conformance-arm64-1-32
-
-# {"cloud": "aws", "distro": "u2404", "extra_flags": "--zones=eu-central-1a --node-size=t3.large --master-size=t3.large", "k8s_version": "1.31", "kops_channel": "alpha", "kops_version": "1.31", "networking": "calico"}
-- name: e2e-kops-aws-conformance-1-31
-  cron: '36 6-23/24 * * *'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-k8s-kops-aws-credential: "true"
-  cluster: k8s-infra-kops-prow-build
-  decorate: true
-  decoration_config:
-    timeout: 180m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20251001' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t3.large --master-size=t3.large" \
-          --kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-1.31/latest-ci-updown-green.txt \
-          --kubernetes-version=https://dl.k8s.io/release/stable-1.31.txt \
-          --test=kops \
-          -- \
-          --test-args="-test.timeout=150m" \
-          --test-package-marker=stable-1.31.txt \
-          --focus-regex="\[Conformance\]" \
-          --skip-regex="\[NoSkip\]" \
-          --parallel=1
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20251021-e2c2c9806f-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          cpu: "4"
-          memory: 6Gi
-        requests:
-          cpu: "4"
-          memory: 6Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/distro: u2404
-    test.kops.k8s.io/extra_flags: --zones=eu-central-1a --node-size=t3.large --master-size=t3.large
-    test.kops.k8s.io/k8s_version: '1.31'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.31'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: conformance-all, kops-1.31, kops-conformance, kops-distro-u2404, kops-k8s-1.31, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-aws-conformance-1-31
-
-# {"cloud": "aws", "distro": "u2404arm64", "extra_flags": "--zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large", "k8s_version": "1.31", "kops_channel": "alpha", "kops_version": "1.31", "networking": "calico"}
-- name: e2e-kops-aws-conformance-arm64-1-31
-  cron: '50 5-23/24 * * *'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-k8s-kops-aws-credential: "true"
-  cluster: k8s-infra-kops-prow-build
-  decorate: true
-  decoration_config:
-    timeout: 180m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20251001' --channel=alpha --networking=calico --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large" \
-          --kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-1.31/latest-ci-updown-green.txt \
-          --kubernetes-version=https://dl.k8s.io/release/stable-1.31.txt \
-          --test=kops \
-          -- \
-          --test-args="-test.timeout=150m" \
-          --test-package-marker=stable-1.31.txt \
-          --focus-regex="\[Conformance\]" \
-          --skip-regex="\[NoSkip\]" \
-          --parallel=1
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20251021-e2c2c9806f-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          cpu: "4"
-          memory: 6Gi
-        requests:
-          cpu: "4"
-          memory: 6Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/distro: u2404arm64
-    test.kops.k8s.io/extra_flags: --zones=eu-central-1a --node-size=t4g.large --master-size=t4g.large
-    test.kops.k8s.io/k8s_version: '1.31'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.31'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: conformance-all, conformance-arm64, kops-1.31, kops-conformance, kops-distro-u2404, kops-k8s-1.31, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-aws-conformance-arm64-1-31