Merge pull request #24344 from hakman/ubuntu-22.04

kOps - Add periodic and pre-submit tests for Ubuntu 22.04 (Jammy)
kubernetes · Nov 14, 2021 · 91d25a8 · 91d25a8
2 parents c643adb + 71c1ce1
commit 91d25a8
Show file tree

Hide file tree

Showing 5 changed files with 144 additions and 3 deletions.
diff --git a/config/jobs/kubernetes/kops/build_jobs.py b/config/jobs/kubernetes/kops/build_jobs.py
@@ -697,7 +697,7 @@ def generate_misc():
 ###############################
 def generate_distros():
     distros = ['debian9', 'debian10', 'debian11', 'ubuntu1804', 'ubuntu2004', 'ubuntu2110',
-               'centos7', 'centos8', 'amazonlinux2', 'rhel7', 'rhel8', 'flatcar']
+               'ubuntu2204', 'centos7', 'centos8', 'amazonlinux2', 'rhel7', 'rhel8', 'flatcar']
     results = []
     for distro in distros:
         distro_short = distro.replace('ubuntu', 'u').replace('debian', 'deb').replace('amazonlinux', 'amzn') # pylint: disable=line-too-long
@@ -924,6 +924,15 @@ def generate_presubmits_e2e():
             tab_name='e2e-ubuntu2110',
             always_run=False,
         ),
+        presubmit_test(
+            distro="u2204",
+            networking='calico',
+            k8s_version='stable',
+            kops_channel='alpha',
+            name='pull-kops-e2e-k8s-ubuntu2204',
+            tab_name='e2e-ubuntu2204',
+            always_run=False,
+        ),
         presubmit_test(
             distro="deb11",
             networking='calico',

diff --git a/config/jobs/kubernetes/kops/helpers.py b/config/jobs/kubernetes/kops/helpers.py
@@ -148,6 +148,7 @@ def latest_aws_image(owner, name):
     'u2004': latest_aws_image('099720109477', 'ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*'), # pylint: disable=line-too-long
     'u2004arm64': latest_aws_image('099720109477', 'ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-*'), # pylint: disable=line-too-long
     'u2110': latest_aws_image('099720109477', 'ubuntu/images/hvm-ssd/ubuntu-impish-21.10-amd64-server-*'), # pylint: disable=line-too-long
+    'u2204': latest_aws_image('099720109477', 'ubuntu-minimal/images-testing/hvm-ssd/ubuntu-jammy-daily-amd64-*'), # pylint: disable=line-too-long
 }
 
 distros_ssh_user = {
@@ -164,4 +165,5 @@ def latest_aws_image(owner, name):
     'u2004': 'ubuntu',
     'u2004arm64': 'ubuntu',
     'u2110': 'ubuntu',
+    'u2204': 'ubuntu',
 }
diff --git a/config/jobs/kubernetes/kops/kops-periodics-distros.yaml b/config/jobs/kubernetes/kops/kops-periodics-distros.yaml
@@ -1,5 +1,5 @@
 # Test jobs generated by build_jobs.py (do not manually edit)
-# 12 jobs, total of 252 runs per week
+# 13 jobs, total of 273 runs per week
 periodics:
 
 # {"cloud": "aws", "container_runtime": "containerd", "distro": "deb9", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
@@ -380,6 +380,69 @@ periodics:
     testgrid-days-of-results: '90'
     testgrid-tab-name: kops-aws-distro-imageubuntu2110
 
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2204", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-aws-distro-imageubuntu2204
+  cron: '47 0-23/8 * * *'
+  labels:
+    preset-service-account: "true"
+    preset-aws-ssh: "true"
+    preset-aws-credential: "true"
+  decorate: true
+  decoration_config:
+    timeout: 90m
+  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-minimal/images-testing/hvm-ssd/ubuntu-jammy-daily-amd64-minimal-20211112' --channel=alpha --networking=calico --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable.txt \
+          --test=kops \
+          -- \
+          --ginkgo-args="--debug" \
+          --test-args="-test.timeout=60m -num-nodes=0" \
+          --test-package-marker=stable.txt \
+          --parallel=25
+      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:v20211111-d096cb0c5f-master
+      imagePullPolicy: Always
+      resources:
+        limits:
+          memory: 3Gi
+        requests:
+          cpu: "2"
+          memory: 3Gi
+  annotations:
+    test.kops.k8s.io/cloud: aws
+    test.kops.k8s.io/container_runtime: containerd
+    test.kops.k8s.io/distro: u2204
+    test.kops.k8s.io/k8s_version: stable
+    test.kops.k8s.io/kops_channel: alpha
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-distro-u2204, kops-distros, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-days-of-results: '90'
+    testgrid-tab-name: kops-aws-distro-imageubuntu2204
+
 # {"cloud": "aws", "container_runtime": "containerd", "distro": "centos7", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
 - name: e2e-kops-aws-distro-imagecentos7
   cron: '50 0-23/8 * * *'

diff --git a/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml b/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml
@@ -1,5 +1,5 @@
 # Test jobs generated by build_jobs.py (do not manually edit)
-# 27 jobs
+# 28 jobs
 presubmits:
   kubernetes/kops:
 
@@ -335,6 +335,71 @@ presubmits:
       testgrid-days-of-results: '90'
       testgrid-tab-name: e2e-ubuntu2110
 
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2204", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"}
+  - name: pull-kops-e2e-k8s-ubuntu2204
+    branches:
+    - master
+    always_run: false
+    skip_report: false
+    labels:
+      preset-service-account: "true"
+      preset-aws-ssh: "true"
+      preset-aws-credential: "true"
+      preset-bazel-scratch-dir: "true"
+      preset-bazel-remote-cache-enabled: "true"
+      preset-dind-enabled: "true"
+    decorate: true
+    decoration_config:
+      timeout: 90m
+    path_alias: k8s.io/kops
+    spec:
+      containers:
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211111-d096cb0c5f-master
+        imagePullPolicy: Always
+        command:
+        - runner.sh
+        args:
+        - bash
+        - -c
+        - |
+            make test-e2e-install
+            kubetest2 kops \
+            -v 2 \
+            --up --build --down \
+            --cloud-provider=aws \
+            --create-args="--image='099720109477/ubuntu-minimal/images-testing/hvm-ssd/ubuntu-jammy-daily-amd64-minimal-20211112' --channel=alpha --networking=calico --container-runtime=containerd" \
+            --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable.txt \
+            --kops-binary-path=/home/prow/go/src/k8s.io/kops/bazel-bin/cmd/kops/linux-amd64/kops \
+            --test=kops \
+            -- \
+            --ginkgo-args="--debug" \
+            --test-args="-test.timeout=60m -num-nodes=0" \
+            --test-package-marker=stable.txt \
+            --parallel=25
+        securityContext:
+          privileged: true
+        env:
+        - name: KUBE_SSH_KEY_PATH
+          value: /etc/aws-ssh/aws-ssh-private
+        - name: KUBE_SSH_USER
+          value: ubuntu
+        - name: GOPATH
+          value: /home/prow/go
+        resources:
+          requests:
+            cpu: "2"
+            memory: "6Gi"
+    annotations:
+      test.kops.k8s.io/cloud: aws
+      test.kops.k8s.io/container_runtime: containerd
+      test.kops.k8s.io/distro: u2204
+      test.kops.k8s.io/k8s_version: stable
+      test.kops.k8s.io/kops_channel: alpha
+      test.kops.k8s.io/networking: calico
+      testgrid-dashboards: kops-distro-u2204, kops-k8s-stable, kops-presubmits, presubmits-kops, sig-cluster-lifecycle-kops
+      testgrid-days-of-results: '90'
+      testgrid-tab-name: e2e-ubuntu2204
+
 # {"cloud": "aws", "container_runtime": "containerd", "distro": "deb11", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"}
   - name: pull-kops-e2e-k8s-debian11
     branches:

diff --git a/config/testgrids/kubernetes/kops/config.yaml b/config/testgrids/kubernetes/kops/config.yaml
@@ -22,6 +22,7 @@ dashboard_groups:
   - kops-distro-u2004
   - kops-distro-u2004arm64
   - kops-distro-u2110
+  - kops-distro-u2204
   - kops-k8s-1.18
   - kops-k8s-1.19
   - kops-k8s-1.20
@@ -56,6 +57,7 @@ dashboards:
 - name: kops-distro-u2004
 - name: kops-distro-u2004arm64
 - name: kops-distro-u2110
+- name: kops-distro-u2204
 - name: kops-k8s-1.18
 - name: kops-k8s-1.19
 - name: kops-k8s-1.20