From edb20982bfc7c8cd2fd092a963a36f5a3bb72a6e Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Sun, 24 Sep 2023 13:08:41 -0400 Subject: [PATCH 1/2] [sig-release] Update to podutils (drop bootstrap.py) Signed-off-by: Davanum Srinivas --- .../sig-release/release-branch-jobs/1.25.yaml | 196 ++++++++------- .../sig-release/release-branch-jobs/1.26.yaml | 223 ++++++++++-------- .../sig-release/release-branch-jobs/1.27.yaml | 223 ++++++++++-------- .../sig-release/release-branch-jobs/1.28.yaml | 223 ++++++++++-------- 4 files changed, 494 insertions(+), 371 deletions(-) diff --git a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.25.yaml b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.25.yaml index 36c664c27498..f927f779755b 100644 --- a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.25.yaml +++ b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.25.yaml @@ -7,14 +7,15 @@ periodics: labels: preset-k8s-ssh: "true" preset-service-account: "true" + decorate: true + decoration_config: + timeout: 220m name: ci-kubernetes-gce-conformance-latest-1-25 spec: containers: - - args: - - --timeout=220 - - --bare - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + args: - --extract=ci/latest-1.25 - --extract-ci-bucket=k8s-release-dev - --gcp-master-image=gci @@ -49,10 +50,6 @@ periodics: spec: containers: - args: - - --timeout=300 - - --bare - - --scenario=kubernetes_e2e - - -- - --check-leaked-resources - --extract=ci/latest-1.25 - --extract-ci-bucket=k8s-release-dev @@ -549,18 +546,20 @@ presubmits: max_concurrency: 12 name: pull-kubernetes-e2e-kops-aws optional: true + decorate: true + decoration_config: + timeout: 75m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --job=$(JOB_NAME) - - --repo=k8s.io/$(REPO_NAME)=$(PULL_REFS) - - --repo=k8s.io/release - - --service-account=/etc/service-account/service-account.json - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=75 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --aws - --aws-cluster-domain=test-cncf-aws.k8s.io - --build=quick @@ -597,17 +596,22 @@ presubmits: preset-pull-kubernetes-e2e: "true" preset-pull-kubernetes-e2e-gce: "true" preset-service-account: "true" + decorate: true + decoration_config: + timeout: 105m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release + workdir: true name: pull-kubernetes-e2e-gce spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=105 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --extract=local @@ -643,16 +647,20 @@ presubmits: preset-service-account: "true" name: pull-kubernetes-e2e-gce-canary skip_report: true + decorate: true + decoration_config: + timeout: 105m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=105 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --extract=local @@ -690,16 +698,20 @@ presubmits: preset-pull-kubernetes-e2e-gce: "true" preset-service-account: "true" name: pull-kubernetes-e2e-gce-ubuntu-containerd + decorate: true + decoration_config: + timeout: 105m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=105 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v1.6.4 @@ -743,16 +755,20 @@ presubmits: preset-pull-kubernetes-e2e-gce: "true" preset-service-account: "true" name: pull-kubernetes-e2e-gce-ubuntu-containerd-canary + decorate: true + decoration_config: + timeout: 105m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=105 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v1.6.4 @@ -798,16 +814,20 @@ presubmits: preset-service-account: "true" name: pull-kubernetes-e2e-gce-ubuntu-containerd-serial optional: true + decorate: true + decoration_config: + timeout: 520m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=520 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v1.6.4 @@ -853,18 +873,20 @@ presubmits: max_concurrency: 5 name: pull-kubernetes-e2e-gce-device-plugin-gpu optional: true + decorate: true + decoration_config: + timeout: 90m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --job=$(JOB_NAME) - - --repo=k8s.io/$(REPO_NAME)=$(PULL_REFS) - - --repo=k8s.io/release - - --service-account=/etc/service-account/service-account.json - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=90 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --extract=local @@ -938,16 +960,20 @@ presubmits: preset-service-account: "true" name: pull-kubernetes-e2e-containerd-gce optional: true + decorate: true + decoration_config: + timeout: 105m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=105 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --extract=local @@ -976,17 +1002,15 @@ presubmits: preset-service-account: "true" max_concurrency: 12 name: pull-kubernetes-node-e2e-containerd + decorate: true + decoration_config: + timeout: 90m spec: containers: - - args: - - --root=/go/src - - --job=$(JOB_NAME) - - --repo=k8s.io/$(REPO_NAME)=$(PULL_REFS) - - --service-account=/etc/service-account/service-account.json - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=90 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --deployment=node - --gcp-zone=us-west1-b - '--node-test-args=--container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"' diff --git a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.26.yaml b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.26.yaml index 16cb372fdf3f..68405150f609 100755 --- a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.26.yaml +++ b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.26.yaml @@ -8,13 +8,14 @@ periodics: preset-k8s-ssh: "true" preset-service-account: "true" name: ci-kubernetes-gce-conformance-latest-1-26 + decorate: true + decoration_config: + timeout: 220m spec: containers: - - args: - - --timeout=220 - - --bare - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + args: - --extract=ci/latest-1.26 - --extract-ci-bucket=k8s-release-dev - --gcp-master-image=gci @@ -46,13 +47,14 @@ periodics: preset-k8s-ssh: "true" preset-service-account: "true" name: ci-kubernetes-e2e-gce-device-plugin-gpu-1-26 + decorate: true + decoration_config: + timeout: 300m spec: containers: - - args: - - --timeout=300 - - --bare - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + args: - --check-leaked-resources - --extract=ci/latest-1.26 - --extract-ci-bucket=k8s-release-dev @@ -546,18 +548,21 @@ presubmits: max_concurrency: 12 name: pull-kubernetes-e2e-kops-aws optional: true + decorate: true + decoration_config: + timeout: 75m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release + workdir: true spec: containers: - - args: - - --root=/go/src - - --job=$(JOB_NAME) - - --repo=k8s.io/$(REPO_NAME)=$(PULL_REFS) - - --repo=k8s.io/release - - --service-account=/etc/service-account/service-account.json - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=75 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --aws - --aws-cluster-domain=test-cncf-aws.k8s.io - --build=quick @@ -594,17 +599,21 @@ presubmits: preset-pull-kubernetes-e2e: "true" preset-pull-kubernetes-e2e-gce: "true" preset-service-account: "true" + decorate: true + decoration_config: + timeout: 105m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release name: pull-kubernetes-e2e-gce spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=105 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --extract=local @@ -640,16 +649,20 @@ presubmits: preset-service-account: "true" name: pull-kubernetes-e2e-gce-canary skip_report: true + decorate: true + decoration_config: + timeout: 105m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=105 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --extract=local @@ -692,16 +705,20 @@ presubmits: preset-pull-kubernetes-e2e-gce: "true" preset-service-account: "true" name: pull-kubernetes-e2e-gce-ubuntu-containerd + decorate: true + decoration_config: + timeout: 105m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=105 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v1.6.9 @@ -750,16 +767,20 @@ presubmits: preset-pull-kubernetes-e2e-gce: "true" preset-service-account: "true" name: pull-kubernetes-e2e-gce-ubuntu-containerd-canary + decorate: true + decoration_config: + timeout: 105m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=105 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v1.6.9 @@ -810,16 +831,20 @@ presubmits: preset-service-account: "true" name: pull-kubernetes-e2e-gce-ubuntu-containerd-serial optional: true + decorate: true + decoration_config: + timeout: 520m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=520 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v1.6.9 @@ -865,16 +890,20 @@ presubmits: preset-service-account: "true" name: pull-e2e-gce-cloud-provider-disabled optional: true + decorate: true + decoration_config: + timeout: 120m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=120 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --env=KUBE_FEATURE_GATES=DisableCloudProviders=true,DisableKubeletCloudCredentialProviders=true @@ -914,18 +943,20 @@ presubmits: max_concurrency: 5 name: pull-kubernetes-e2e-gce-device-plugin-gpu optional: true + decorate: true + decoration_config: + timeout: 90m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --job=$(JOB_NAME) - - --repo=k8s.io/$(REPO_NAME)=$(PULL_REFS) - - --repo=k8s.io/release - - --service-account=/etc/service-account/service-account.json - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=90 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --extract=local @@ -1001,16 +1032,20 @@ presubmits: preset-service-account: "true" name: pull-kubernetes-e2e-containerd-gce optional: true + decorate: true + decoration_config: + timeout: 105m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=105 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --extract=local @@ -1039,17 +1074,15 @@ presubmits: preset-service-account: "true" max_concurrency: 12 name: pull-kubernetes-node-e2e-containerd + decorate: true + decoration_config: + timeout: 90m spec: containers: - - args: - - --root=/go/src - - --job=$(JOB_NAME) - - --repo=k8s.io/$(REPO_NAME)=$(PULL_REFS) - - --service-account=/etc/service-account/service-account.json - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=90 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --deployment=node - --gcp-zone=us-west1-b - '--node-test-args=--container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"' diff --git a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.27.yaml b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.27.yaml index 3eca089f16df..cf5d08a43846 100644 --- a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.27.yaml +++ b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.27.yaml @@ -8,13 +8,14 @@ periodics: preset-k8s-ssh: "true" preset-service-account: "true" name: ci-kubernetes-gce-conformance-latest-1-27 + decorate: true + decoration_config: + timeout: 220m spec: containers: - - args: - - --timeout=220 - - --bare - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + args: - --extract=ci/latest-1.27 - --extract-ci-bucket=k8s-release-dev - --gcp-master-image=gci @@ -46,13 +47,14 @@ periodics: preset-k8s-ssh: "true" preset-service-account: "true" name: ci-kubernetes-e2e-gce-device-plugin-gpu-1-27 + decorate: true + decoration_config: + timeout: 300m spec: containers: - - args: - - --timeout=300 - - --bare - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + args: - --check-leaked-resources - --extract=ci/latest-1.27 - --extract-ci-bucket=k8s-release-dev @@ -556,18 +558,21 @@ presubmits: max_concurrency: 12 name: pull-kubernetes-e2e-kops-aws optional: true + decorate: true + decoration_config: + timeout: 75m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release + workdir: true spec: containers: - - args: - - --root=/go/src - - --job=$(JOB_NAME) - - --repo=k8s.io/$(REPO_NAME)=$(PULL_REFS) - - --repo=k8s.io/release - - --service-account=/etc/service-account/service-account.json - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=75 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --aws - --aws-cluster-domain=test-cncf-aws.k8s.io - --build=quick @@ -604,17 +609,21 @@ presubmits: preset-pull-kubernetes-e2e: "true" preset-pull-kubernetes-e2e-gce: "true" preset-service-account: "true" + decorate: true + decoration_config: + timeout: 105m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release name: pull-kubernetes-e2e-gce-cos spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=105 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --extract=local @@ -650,16 +659,20 @@ presubmits: preset-service-account: "true" name: pull-kubernetes-e2e-gce-cos-canary skip_report: true + decorate: true + decoration_config: + timeout: 105m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=105 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --extract=local @@ -697,16 +710,20 @@ presubmits: preset-pull-kubernetes-e2e-gce: "true" preset-service-account: "true" name: pull-kubernetes-e2e-gce + decorate: true + decoration_config: + timeout: 105m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=105 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v1.6.18 @@ -750,16 +767,20 @@ presubmits: preset-pull-kubernetes-e2e-gce: "true" preset-service-account: "true" name: pull-kubernetes-e2e-gce-canary + decorate: true + decoration_config: + timeout: 105m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=105 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v1.6.18 @@ -805,16 +826,20 @@ presubmits: preset-service-account: "true" name: pull-kubernetes-e2e-gce-serial optional: true + decorate: true + decoration_config: + timeout: 520m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=520 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v1.6.18 @@ -860,16 +885,20 @@ presubmits: preset-service-account: "true" name: pull-e2e-gce-cloud-provider-disabled optional: true + decorate: true + decoration_config: + timeout: 120m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=120 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --env=KUBE_FEATURE_GATES=DisableCloudProviders=true,DisableKubeletCloudCredentialProviders=true @@ -909,18 +938,20 @@ presubmits: max_concurrency: 5 name: pull-kubernetes-e2e-gce-device-plugin-gpu optional: true + decorate: true + decoration_config: + timeout: 90m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --job=$(JOB_NAME) - - --repo=k8s.io/$(REPO_NAME)=$(PULL_REFS) - - --repo=k8s.io/release - - --service-account=/etc/service-account/service-account.json - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=90 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --extract=local @@ -955,16 +986,20 @@ presubmits: preset-service-account: "true" name: pull-kubernetes-e2e-containerd-gce optional: true + decorate: true + decoration_config: + timeout: 105m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=105 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --extract=local @@ -993,17 +1028,15 @@ presubmits: preset-service-account: "true" max_concurrency: 12 name: pull-kubernetes-node-e2e-containerd + decorate: true + decoration_config: + timeout: 90m spec: containers: - - args: - - --root=/go/src - - --job=$(JOB_NAME) - - --repo=k8s.io/$(REPO_NAME)=$(PULL_REFS) - - --service-account=/etc/service-account/service-account.json - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=90 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --deployment=node - --gcp-zone=us-west1-b - '--node-test-args=--container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"' diff --git a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.28.yaml b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.28.yaml index 2a125a5ca801..a3fb251f9899 100644 --- a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.28.yaml +++ b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.28.yaml @@ -8,13 +8,14 @@ periodics: preset-k8s-ssh: "true" preset-service-account: "true" name: ci-kubernetes-gce-conformance-latest-1-28 + decorate: true + decoration_config: + timeout: 220m spec: containers: - - args: - - --timeout=220 - - --bare - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + args: - --extract=ci/latest-1.28 - --extract-ci-bucket=k8s-release-dev - --gcp-master-image=gci @@ -46,13 +47,14 @@ periodics: preset-k8s-ssh: "true" preset-service-account: "true" name: ci-kubernetes-e2e-gce-device-plugin-gpu-1-28 + decorate: true + decoration_config: + timeout: 300m spec: containers: - - args: - - --timeout=300 - - --bare - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + args: - --check-leaked-resources - --extract=ci/latest-1.28 - --extract-ci-bucket=k8s-release-dev @@ -556,18 +558,21 @@ presubmits: max_concurrency: 12 name: pull-kubernetes-e2e-kops-aws optional: true + decorate: true + decoration_config: + timeout: 75m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release + workdir: true spec: containers: - - args: - - --root=/go/src - - --job=$(JOB_NAME) - - --repo=k8s.io/$(REPO_NAME)=$(PULL_REFS) - - --repo=k8s.io/release - - --service-account=/etc/service-account/service-account.json - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=75 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --aws - --aws-cluster-domain=test-cncf-aws.k8s.io - --build=quick @@ -604,17 +609,21 @@ presubmits: preset-pull-kubernetes-e2e: "true" preset-pull-kubernetes-e2e-gce: "true" preset-service-account: "true" + decorate: true + decoration_config: + timeout: 105m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release name: pull-kubernetes-e2e-gce-cos spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=105 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --extract=local @@ -650,16 +659,20 @@ presubmits: preset-service-account: "true" name: pull-kubernetes-e2e-gce-cos-canary skip_report: true + decorate: true + decoration_config: + timeout: 105m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=105 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --extract=local @@ -697,16 +710,20 @@ presubmits: preset-pull-kubernetes-e2e-gce: "true" preset-service-account: "true" name: pull-kubernetes-e2e-gce + decorate: true + decoration_config: + timeout: 105m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=105 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v1.7.1 @@ -750,16 +767,20 @@ presubmits: preset-pull-kubernetes-e2e-gce: "true" preset-service-account: "true" name: pull-kubernetes-e2e-gce-canary + decorate: true + decoration_config: + timeout: 105m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=105 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v1.7.1 @@ -805,16 +826,20 @@ presubmits: preset-service-account: "true" name: pull-kubernetes-e2e-gce-serial optional: true + decorate: true + decoration_config: + timeout: 520m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=520 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --env=KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION=v1.7.1 @@ -860,16 +885,20 @@ presubmits: preset-service-account: "true" name: pull-e2e-gce-cloud-provider-disabled optional: true + decorate: true + decoration_config: + timeout: 120m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=120 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --env=KUBE_FEATURE_GATES=DisableCloudProviders=true,DisableKubeletCloudCredentialProviders=true @@ -909,18 +938,20 @@ presubmits: max_concurrency: 5 name: pull-kubernetes-e2e-gce-device-plugin-gpu optional: true + decorate: true + decoration_config: + timeout: 90m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --job=$(JOB_NAME) - - --repo=k8s.io/$(REPO_NAME)=$(PULL_REFS) - - --repo=k8s.io/release - - --service-account=/etc/service-account/service-account.json - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=90 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --extract=local @@ -952,16 +983,20 @@ presubmits: preset-service-account: "true" name: pull-kubernetes-e2e-containerd-gce optional: true + decorate: true + decoration_config: + timeout: 105m + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: k8s.io/release spec: containers: - - args: - - --root=/go/src - - --repo=k8s.io/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=105 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --build=quick - --cluster= - --extract=local @@ -990,17 +1025,15 @@ presubmits: preset-service-account: "true" max_concurrency: 12 name: pull-kubernetes-node-e2e-containerd + decorate: true + decoration_config: + timeout: 90m spec: containers: - - args: - - --root=/go/src - - --job=$(JOB_NAME) - - --repo=k8s.io/$(REPO_NAME)=$(PULL_REFS) - - --service-account=/etc/service-account/service-account.json - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=90 - - --scenario=kubernetes_e2e - - -- + - command: + - runner.sh + - /workspace/scenarios/kubernetes_e2e.py + args: - --deployment=node - --gcp-zone=us-west1-b - '--node-test-args=--container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"' From c03daa910489ff13263b83bd714a69c5bed5180b Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 25 Sep 2023 10:08:31 -0400 Subject: [PATCH 2/2] add test to prevent any new bootstrap/scenario based jobs Signed-off-by: Davanum Srinivas --- config/tests/jobs/jobs_test.go | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/config/tests/jobs/jobs_test.go b/config/tests/jobs/jobs_test.go index 8d0c574acff7..b0f372c96d63 100644 --- a/config/tests/jobs/jobs_test.go +++ b/config/tests/jobs/jobs_test.go @@ -816,24 +816,12 @@ func checkScenarioArgs(jobName, imageName string, args []string) error { } } - if scenario == "" { - if !scenarioArgs { - if strings.Contains(imageName, "kubekins-e2e") || - strings.Contains(imageName, "bootstrap") || - strings.Contains(imageName, "gcloud-in-go") { - return fmt.Errorf("job %s: image %s uses bootstrap.py and need scenario args", jobName, imageName) - } - return nil - } - - } else { - if _, err := os.Stat(fmt.Sprintf("../../../scenarios/%s.py", scenario)); err != nil { - return fmt.Errorf("job %s: scenario %s does not exist: %s", jobName, scenario, err) - } - - if !scenarioArgs { - return fmt.Errorf("job %s: set --scenario=%s and will need scenario args", jobName, scenario) - } + if scenario != "" { + return fmt.Errorf("job %s: scenario (%s) based bootstrap.py jobs are not supported", + jobName, scenario) + } + if scenarioArgs { + return fmt.Errorf("job %s: scenario based bootstrap.py jobs are not supported", jobName) } // shared build args