Merge pull request #29907 from justinsb/boskos_in_aws_jobs

kops tests: support passing --boskos-resource-type flag

Author: k8s-ci-robot

config/jobs/kubernetes/kops/build_jobs.py

@@ -273,6 +273,13 @@ def presubmit_test(branch='master',
         kops_ssh_user = 'prow'
         kops_ssh_key_path = '/etc/ssh-key-secret/ssh-private'
 
+    boskos_resource_type = None
+    if use_boskos:
+        if cloud == 'aws':
+            boskos_resource_type = 'aws-account'
+        else:
+            raise Exception(f"use_boskos not supported on cloud {cloud}")
+
     if extra_flags is None:
         extra_flags = []
 
@@ -326,7 +333,7 @@ def presubmit_test(branch='master',
         artifacts=artifacts,
         env=env,
         template_path=template_path,
-        use_boskos=use_boskos,
+        boskos_resource_type=boskos_resource_type,
     )
 
     spec = {
@@ -1614,6 +1621,11 @@ def generate_presubmits_e2e():
             always_run=False,
             use_boskos=True,
         ),
+        presubmit_test(
+            name='presubmit-kops-aws-boskos-kubetest2',
+            always_run=False,
+            use_boskos=True,
+        ),
     ]
 
     return jobs

config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml

@@ -1,5 +1,5 @@
 # Test jobs generated by build_jobs.py (do not manually edit)
-# 39 jobs
+# 40 jobs
 presubmits:
   kubernetes/kops:
 
@@ -2490,3 +2490,67 @@ presubmits:
       testgrid-dashboards: kops-presubmits, presubmits-kops, sig-cluster-lifecycle-kops
       testgrid-days-of-results: '90'
       testgrid-tab-name: presubmit-kops-aws-boskos
+
+# {"cloud": "aws", "distro": "u2204", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"}
+  - name: presubmit-kops-aws-boskos-kubetest2
+    branches:
+    - master
+    always_run: false
+    optional: false
+    skip_report: false
+    labels:
+      preset-service-account: "true"
+      preset-aws-ssh: "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:v20230616-e730b60769-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/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20230608' --channel=alpha --networking=cilium --discovery-store=s3://k8s-kops-prow/discovery" \
+            --boskos-resource-type=aws-account \
+            --kubernetes-version=https://dl.k8s.io/release/stable.txt \
+            --kops-binary-path=/home/prow/go/src/k8s.io/kops/.build/dist/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/distro: u2204
+      test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+      test.kops.k8s.io/k8s_version: stable
+      test.kops.k8s.io/kops_channel: alpha
+      test.kops.k8s.io/networking: cilium
+      testgrid-dashboards: kops-presubmits, presubmits-kops, sig-cluster-lifecycle-kops
+      testgrid-days-of-results: '90'
+      testgrid-tab-name: presubmit-kops-aws-boskos-kubetest2

config/jobs/kubernetes/kops/templates/periodic-scenario.yaml.jinja

@@ -4,7 +4,9 @@
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
+    {%- if not boskos_resource_type %}
     preset-aws-credential: "true"
+    {%- endif %}
     preset-dind-enabled: "true"
   max_concurrency: 1
   decorate: true

config/jobs/kubernetes/kops/templates/periodic.yaml.jinja

@@ -5,7 +5,9 @@
     {%- if cloud == "aws" %}
     preset-service-account: "true"
     preset-aws-ssh: "true"
+    {%- if not boskos_resource_type %}
     preset-aws-credential: "true"
+    {%- endif %}
     {%- else %}
     preset-k8s-ssh: "true"
     {%- endif %}

config/jobs/kubernetes/kops/templates/presubmit-scenario.yaml.jinja

@@ -11,7 +11,7 @@
     labels:
       preset-service-account: "true"
       preset-aws-ssh: "true"
-      {%- if not use_boskos %}
+      {%- if not boskos_resource_type %}
       preset-aws-credential: "true"
       {%- endif %}
       preset-dind-enabled: "true"

config/jobs/kubernetes/kops/templates/presubmit.yaml.jinja

@@ -12,7 +12,7 @@
       {%- if cloud == "aws" %}
       preset-service-account: "true"
       preset-aws-ssh: "true"
-      {%- if not use_boskos %}
+      {%- if not boskos_resource_type %}
       preset-aws-credential: "true"
       {%- endif %}
       {%- if branch in ["release-1.22", "release-1.23"] %}
@@ -49,6 +49,9 @@
             {%- if kops_feature_flags %}
             --env=KOPS_FEATURE_FLAGS={{kops_feature_flags}} \
             {%- endif %}
+            {%- if boskos_resource_type %}
+            --boskos-resource-type={{boskos_resource_type}} \
+            {%- endif %}
             --kubernetes-version={{k8s_deploy_url}} \
             {%- if branch in ["release-1.22", "release-1.23"] %}
             --kops-binary-path=/home/prow/go/src/k8s.io/kops/bazel-bin/cmd/kops/linux-amd64/kops \