Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set up 1.14 CI (#11203 + patches + rebump) #11370

Merged
merged 10 commits into from Feb 20, 2019

Conversation

@krzyzacy
Copy link
Member

krzyzacy commented Feb 19, 2019

/assign

So since @amwat had two bumps in his branch... what I did:

# Move back beyond the previous conflict bump
git reset HEAD~30 --hard

# checkout the PR
git checkout -b amwat-remove-1.10 master
git pull https://github.com/amwat/test-infra.git remove-1.10

# try to bump to previous 
(hard-coded TAG=`v20190214-f4092ae69`)
./experiment/bump_e2e_image.sh

# sync HEAD
git rebase upstream/master

# bump again
./experiment/bump_e2e_image.sh

and I also made a few changes on top of the original PR to fix the wrong image mappings

cc @imkin @BenTheElder @spiffxp

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Feb 19, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: krzyzacy

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

amwat and others added some commits Feb 8, 2019

Bump to gcr.io/k8s-testimages/kubekins-e2e:v20190213-f6a16b59b-(maste…
…r|experimental|releases) (using generate_tests and manual)
Bump to gcr.io/k8s-testimages/kubekins-e2e:v20190214-f4092ae69-(maste…
…r|experimental|releases) (using generate_tests and manual)

@krzyzacy krzyzacy force-pushed the krzyzacy:amwat-remove-1.10 branch from 063ed27 to e4d450e Feb 19, 2019

krzyzacy added some commits Feb 19, 2019

Bump to gcr.io/k8s-testimages/kubekins-e2e:v20190219-caa48e6c3-(maste…
…r|experimental|releases) (using generate_tests and manual)

@krzyzacy krzyzacy force-pushed the krzyzacy:amwat-remove-1.10 branch 3 times, most recently from 55317d6 to 90e46fe Feb 19, 2019

@krzyzacy

This comment has been minimized.

Copy link
Member Author

krzyzacy commented Feb 19, 2019

@k8s-ci-robot k8s-ci-robot assigned BenTheElder and unassigned krzyzacy Feb 19, 2019

Show resolved Hide resolved config/jobs/kubeflow/kubeflow-postsubmits.yaml
Show resolved Hide resolved config/jobs/kubernetes-security/generated-security-jobs.yaml Outdated
@@ -1555,51 +1555,6 @@ presubmits:
name: pull-security-kubernetes-cross
rerun_command: /test pull-security-kubernetes-cross
run_if_changed: ^((build\/|hack\/lib\/).*)|(.*Makefile.*)$
skip_branches:

This comment has been minimized.

@imkin

imkin Feb 19, 2019

Contributor

This should not have been part of release cut change. It gets difficult to automate such special changes. Also difficult to track why they were removed and not rotated to a new version.

@@ -3244,7 +3199,57 @@ presubmits:
value: /workspace/k8s.io/kubernetes
- name: METADATA_BANDAID
value: "true"
image: gcr.io/k8s-testimages/kubekins-e2e:v20190214-f4092ae69-master
image: gcr.io/k8s-testimages/kubekins-e2e:v20190219-caa48e6c3-master

This comment has been minimized.

@imkin

imkin Feb 19, 2019

Contributor

Would it make sense to split the new job additions into another commit/PR so that they can be tracked?
Maybe we can add Comment/description?

This comment has been minimized.

@krzyzacy

krzyzacy Feb 19, 2019

Author Member

this file/config is completely generated from other files, we want to avoid handcraft it.

This comment has been minimized.

@imkin

imkin Feb 19, 2019

Contributor

may be we should add description field into the job configs. This will help generate description too.

This comment has been minimized.

@krzyzacy

krzyzacy Feb 19, 2019

Author Member

there's

# Autogenerated by genjobs.go, do NOT edit!
# see genjobs.go, which you can run with hack/update-config.sh

at the top... maybe we don't even need to check-in this config? /shrug

feel free to open an issue/PR if you think it bothers you.

Show resolved Hide resolved config/jobs/kubernetes-security/generated-security-jobs.yaml
Show resolved Hide resolved ...ubernetes-sigs/cluster-api-provider-aws/cluster-api-provider-aws-ci.yaml
Show resolved Hide resolved ...s-sigs/cluster-api-provider-aws/cluster-api-provider-aws-presubmits.yaml

@krzyzacy krzyzacy force-pushed the krzyzacy:amwat-remove-1.10 branch from 90e46fe to cfdefe0 Feb 19, 2019

Show resolved Hide resolved config/jobs/kubernetes/kops/kops-config.yaml Outdated
- interval: 6h
name: ci-kubernetes-gce-conformance-stable-1-10
name: ci-kubernetes-gce-conformance-latest-1-14

This comment has been minimized.

@imkin

imkin Feb 19, 2019

Contributor

seems like
ci-kubernetes-gce-conformance-latest-1-14 and ci-kubernetes-gce-conformance-stable-1-14 job configs have merged.

This comment has been minimized.

@krzyzacy

krzyzacy Feb 19, 2019

Author Member

I don't think so, link to PR?

This comment has been minimized.

@krzyzacy

krzyzacy Feb 20, 2019

Author Member

why?

This comment has been minimized.

@krzyzacy

krzyzacy Feb 20, 2019

Author Member

fixed the extract line.

stable-1.14 will not work until 1.14 is released, so punt till then.

This comment has been minimized.

@imkin

imkin Feb 20, 2019

Contributor

line 88 says "latest" and line 99 says "stable".

Show resolved Hide resolved config/jobs/kubernetes/sig-release/kubernetes-builds.yaml
@spiffxp
Copy link
Member

spiffxp left a comment

Not sure I'm ready to /lgtm this just yet, some of the changes confuse me a bit, mainly around:

  • intervals getting lowered (I thought intervals were fixed for the stable aliases, here they seem to be following the versions the aliases)
  • jobs using one stable alias in their name, but a different one in their config

The nits I don't really care about, but pointing them out as I found them

Show resolved Hide resolved config/jobs/kubernetes/kops/kops-config.yaml Outdated
Show resolved Hide resolved config/jobs/kubernetes/kops/kops-config.yaml Outdated
@@ -73,53 +73,3 @@ periodics:
- --eks-nodes=100
- --test_args=--ginkgo.focus=\[Feature:Performance\] --minStartupPods=8
- --timeout=300m

# Kubernetes e2e correctness tests against EKS 1.10 build.

This comment has been minimized.

@spiffxp

spiffxp Feb 19, 2019

Member

The removal of this might raise eyebrows, but I get it, this isn't something we as a community support.

This comment has been minimized.

@krzyzacy

krzyzacy Feb 19, 2019

Author Member

I think eks can still run 1.10 CI (if they care) in their prow instance, instead of community prow instance :-) cc @gyuho @shyamjvs

Show resolved Hide resolved config/jobs/kubernetes/sig-node/node-kubelet.yaml
Show resolved Hide resolved config/jobs/kubernetes/sig-release/kubernetes-builds.yaml Outdated
Show resolved Hide resolved config/jobs/kubernetes/sig-testing/verify.yaml Outdated
Show resolved Hide resolved config/jobs/kubernetes/sig-testing/verify.yaml Outdated
Show resolved Hide resolved config/jobs/kubernetes/sig-testing/verify.yaml Outdated
Show resolved Hide resolved jobs/e2e_node/image-config-1-14.yaml
Show resolved Hide resolved testgrid/config.yaml Outdated
@@ -5,8 +5,8 @@ images:
ubuntu:
image: ubuntu-gke-1604-xenial-v20170420-1 # docker 1.12.6

This comment has been minimized.

@imkin

imkin Feb 19, 2019

Contributor

Where do we use this image in 1.14 release (noting that the docker version is unsupported and deprecated).

This comment has been minimized.

@krzyzacy

This comment has been minimized.

@imkin

imkin Feb 19, 2019

Contributor

May be will also ping sig-node slack after this goes through.

This comment has been minimized.

@yujuhong

yujuhong Feb 20, 2019

Member

This should be updated to a newer version, see #10820
/cc @yguo0905

@krzyzacy krzyzacy force-pushed the krzyzacy:amwat-remove-1.10 branch 5 times, most recently from 630466f to 02f082b Feb 19, 2019

@krzyzacy

This comment has been minimized.

Copy link
Member Author

krzyzacy commented Feb 20, 2019

lol - # manual-release-bump-required is not very error prune, I think all outstanding comments are addressed

@krzyzacy krzyzacy force-pushed the krzyzacy:amwat-remove-1.10 branch from 02f082b to f9b3776 Feb 20, 2019

@k8s-ci-robot k8s-ci-robot requested a review from yguo0905 Feb 20, 2019

@krzyzacy krzyzacy force-pushed the krzyzacy:amwat-remove-1.10 branch from f9b3776 to d8f360c Feb 20, 2019

@imkin

This comment has been minimized.

Copy link
Contributor

imkin commented Feb 20, 2019

I am lgtm.

Ping @spiffxp to see if he thinks this can now be merged.

@spiffxp

This comment has been minimized.

Copy link
Member

spiffxp commented Feb 20, 2019

/lgtm
thanks for working through all of this

@k8s-ci-robot k8s-ci-robot added the lgtm label Feb 20, 2019

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Feb 20, 2019

LGTM label has been added.

Git tree hash: f091d75c3ed80898f01ed97e00d65b04483d383d

@k8s-ci-robot k8s-ci-robot merged commit 66076b4 into kubernetes:master Feb 20, 2019

14 checks passed

cla/linuxfoundation krzyzacy authorized
Details
pull-test-infra-bazel Job succeeded.
Details
pull-test-infra-gubernator Skipped
pull-test-infra-lint Job succeeded.
Details
pull-test-infra-verify-bazel Job succeeded.
Details
pull-test-infra-verify-codegen Job succeeded.
Details
pull-test-infra-verify-config Job succeeded.
Details
pull-test-infra-verify-deps Skipped
pull-test-infra-verify-file-perms Job succeeded.
Details
pull-test-infra-verify-gofmt Job succeeded.
Details
pull-test-infra-verify-govet Job succeeded.
Details
pull-test-infra-verify-labels Skipped
pull-test-infra-verify-tslint Skipped
tide In merge pool.
Details
@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Feb 20, 2019

@krzyzacy: Updated the job-config configmap using the following files:

  • key structured-merge-diff-presubmits.yaml using file config/jobs/kubernetes-sigs/structured-merge-diff/structured-merge-diff-presubmits.yaml
  • key cluster-registry-config.yaml using file config/jobs/kubernetes/cluster-registry/cluster-registry-config.yaml
  • key generated.yaml using file config/jobs/kubernetes/generated/generated.yaml
  • key eks-periodics.yaml using file config/jobs/kubernetes/sig-aws/eks/eks-periodics.yaml
  • key charts.yaml using file config/jobs/helm/charts/charts.yaml
  • key aws-alb-ingress-controller-presubmits.yaml using file config/jobs/kubernetes-sigs/aws-alb-ingress-controller/aws-alb-ingress-controller-presubmits.yaml
  • key cluster-api-provider-vsphere-presubmits.yaml using file config/jobs/kubernetes-sigs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-presubmits.yaml
  • key kind-postsubmits.yaml using file config/jobs/kubernetes-sigs/kind/kind-postsubmits.yaml
  • key sig-gcp-gce-config.yaml using file config/jobs/kubernetes/sig-gcp/sig-gcp-gce-config.yaml
  • key sig-scalability-release-blocking-jobs.yaml using file config/jobs/kubernetes/sig-scalability/sig-scalability-release-blocking-jobs.yaml
  • key structured-merge-diff-ci.yaml using file config/jobs/kubernetes-sigs/structured-merge-diff/structured-merge-diff-ci.yaml
  • key cloud-provider-aws-config.yaml using file config/jobs/kubernetes/cloud-provider-aws/cloud-provider-aws-config.yaml
  • key node-docker.yaml using file config/jobs/kubernetes/sig-node/node-docker.yaml
  • key cluster-api-presubmits.yaml using file config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits.yaml
  • key kind-presubmits.yaml using file config/jobs/kubernetes-sigs/kind/kind-presubmits.yaml
  • key poseidon-config.yaml using file config/jobs/kubernetes-sigs/poseidon/poseidon-config.yaml
  • key sig-windows-config.yaml using file config/jobs/kubernetes-sigs/sig-windows/sig-windows-config.yaml
  • key ingress-gce-e2e.yaml using file config/jobs/kubernetes/sig-network/ingress-gce-e2e.yaml
  • key sig-scalability-periodic-jobs.yaml using file config/jobs/kubernetes/sig-scalability/sig-scalability-periodic-jobs.yaml
  • key bazel-build-test.yaml using file config/jobs/kubernetes/sig-testing/bazel-build-test.yaml
  • key local-e2e.yaml using file config/jobs/kubernetes/sig-testing/local-e2e.yaml
  • key service-catalog-presubmits.yaml using file config/jobs/kubernetes-incubator/service-catalog/service-catalog-presubmits.yaml
  • key gcp-compute-persistent-disk-csi-driver-postsubmits.yaml using file config/jobs/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/gcp-compute-persistent-disk-csi-driver-postsubmits.yaml
  • key eks-presubmits.yaml using file config/jobs/kubernetes/sig-aws/eks/eks-presubmits.yaml
  • key sig-gcp-gpu-presubmit.yaml using file config/jobs/kubernetes/sig-gcp/gpu/sig-gcp-gpu-presubmit.yaml
  • key sig-azure-config.yaml using file config/jobs/kubernetes/sig-azure/sig-azure-config.yaml
  • key sig-gcp-gke-config.yaml using file config/jobs/kubernetes/sig-gcp/sig-gcp-gke-config.yaml
  • key test-infra-postsubmits.yaml using file config/jobs/kubernetes/test-infra/test-infra-postsubmits.yaml
  • key cadvisor.yaml using file config/jobs/cadvisor/cadvisor.yaml
  • key cluster-api-provider-digitalocean-presubmits.yaml using file config/jobs/kubernetes-sigs/cluster-api-provider-digitalocean/cluster-api-provider-digitalocean-presubmits.yaml
  • key cluster-api-provider-vsphere-ci.yaml using file config/jobs/kubernetes-sigs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-ci.yaml
  • key sig-api-machinery-config.yaml using file config/jobs/kubernetes/sig-api-machinery/sig-api-machinery-config.yaml
  • key gke-test-containerd.yaml using file config/jobs/gke/containerd/gke-test-containerd.yaml
  • key kubeflow-postsubmits.yaml using file config/jobs/kubeflow/kubeflow-postsubmits.yaml
  • key sig-gcp-gpu-autoscaling.yaml using file config/jobs/kubernetes/sig-gcp/gpu/sig-gcp-gpu-autoscaling.yaml
  • key local-e2e-containerized.yaml using file config/jobs/kubernetes/sig-node/local-e2e-containerized.yaml
  • key k8s-upgrade-gke.yaml using file config/jobs/kubernetes/sig-cluster-lifecycle/k8s-upgrade-gke.yaml
  • key node-kubelet.yaml using file config/jobs/kubernetes/sig-node/node-kubelet.yaml
  • key cluster-api-provider-openstack-presubmits.yaml using file config/jobs/kubernetes-sigs/cluster-api-provider-openstack/cluster-api-provider-openstack-presubmits.yaml
  • key config.yaml using file config/jobs/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/config.yaml
  • key sig-storage-local-static-provisioner.yaml using file config/jobs/kubernetes-sigs/sig-storage-local-static-provisioner/sig-storage-local-static-provisioner.yaml
  • key release-config.yaml using file config/jobs/kubernetes/release/release-config.yaml
  • key cloud-provider-azure-config.yaml using file config/jobs/kubernetes/cloud-provider-azure/cloud-provider-azure-config.yaml
  • key kops-presubmits.yaml using file config/jobs/kubernetes/sig-aws/kops/kops-presubmits.yaml
  • key sig-cluster-lifecycle-misc.yaml using file config/jobs/kubernetes/sig-cluster-lifecycle/sig-cluster-lifecycle-misc.yaml
  • key godeps.yaml using file config/jobs/kubernetes/sig-testing/godeps.yaml
  • key publishing-bot-presubmits.yaml using file config/jobs/kubernetes/publishing-bot/publishing-bot-presubmits.yaml
  • key sig-gcp-gpu-gce.yaml using file config/jobs/kubernetes/sig-gcp/gpu/sig-gcp-gpu-gce.yaml
  • key k8s-multicluster-ingress-config.yaml using file config/jobs/GoogleCloudPlatform/k8s-multicluster-ingress/k8s-multicluster-ingress-config.yaml
  • key spark-config.yaml using file config/jobs/apache-spark-on-k8s/spark-integration/spark-config.yaml
  • key generated-security-jobs.yaml using file config/jobs/kubernetes-security/generated-security-jobs.yaml
  • key sig-storage-local-static-provisioner-trusted.yaml using file config/jobs/kubernetes-sigs/sig-storage-local-static-provisioner/sig-storage-local-static-provisioner-trusted.yaml
  • key sig-gcp-gpu-upgrade-downgrade.yaml using file config/jobs/kubernetes/sig-gcp/gpu/sig-gcp-gpu-upgrade-downgrade.yaml
  • key sig-gcp-windows.yaml using file config/jobs/kubernetes/sig-gcp/sig-gcp-windows.yaml
  • key sig-network-misc.yaml using file config/jobs/kubernetes/sig-network/sig-network-misc.yaml
  • key cluster-api-provider-azure-presubmits.yaml using file config/jobs/kubernetes-sigs/cluster-api-provider-azure/cluster-api-provider-azure-presubmits.yaml
  • key presubmits.yaml using file config/jobs/kubernetes-sigs/kube-storage-version-migrator/presubmits.yaml
  • key kubeadm-upgrade.yaml using file config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-upgrade.yaml
  • key kubeadm-x-on-y.yaml using file config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-x-on-y.yaml
  • key cluster-api-provider-gcp-presubmits.yaml using file config/jobs/kubernetes-sigs/cluster-api-provider-gcp/cluster-api-provider-gcp-presubmits.yaml
  • key sig-node-presubmit.yaml using file config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml
  • key janitors.yaml using file config/jobs/kubernetes/test-infra/janitors.yaml
  • key kops-periodics.yaml using file config/jobs/kubernetes/sig-aws/kops/kops-periodics.yaml
  • key sig-scalability-presubmit-jobs.yaml using file config/jobs/kubernetes/sig-scalability/sig-scalability-presubmit-jobs.yaml
  • key verify.yaml using file config/jobs/kubernetes/sig-testing/verify.yaml
  • key containerd-cri-presubmit-jobs.yaml using file config/jobs/containerd/cri/containerd-cri-presubmit-jobs.yaml
  • key aws-ebs-csi-driver-presubmits.yaml using file config/jobs/kubernetes-sigs/aws-ebs-csi-driver/aws-ebs-csi-driver-presubmits.yaml
  • key cloud-provider-openstack-config.yaml using file config/jobs/kubernetes/cloud-provider-openstack/cloud-provider-openstack-config.yaml
  • key kops-config.yaml using file config/jobs/kubernetes/kops/kops-config.yaml
  • key ci-e2e-gce-netd.yaml using file config/jobs/kubernetes/sig-network/ci-e2e-gce-netd.yaml
  • key containerd.yaml using file config/jobs/kubernetes/sig-node/containerd.yaml
  • key integration.yaml using file config/jobs/kubernetes/sig-testing/integration.yaml
  • key cluster-api-provider-aws-ci.yaml using file config/jobs/kubernetes-sigs/cluster-api-provider-aws/cluster-api-provider-aws-ci.yaml
  • key kind.yaml using file config/jobs/kubernetes-sigs/kind/kind.yaml
  • key kustomize-config.yaml using file config/jobs/kubernetes-sigs/kustomize/kustomize-config.yaml
  • key sig-cli-config.yaml using file config/jobs/kubernetes/sig-cli/sig-cli-config.yaml
  • key sig-apps-config.yaml using file config/jobs/kubernetes/sig-apps/sig-apps-config.yaml
  • key sig-autoscaling-config.yaml using file config/jobs/kubernetes/sig-autoscaling/sig-autoscaling-config.yaml
  • key sig-gcp-gpu-gke.yaml using file config/jobs/kubernetes/sig-gcp/gpu/sig-gcp-gpu-gke.yaml
  • key sig-instrumentation-config.yaml using file config/jobs/kubernetes/sig-instrumentation/sig-instrumentation-config.yaml
  • key test-infra-periodics.yaml using file config/jobs/kubernetes/test-infra/test-infra-periodics.yaml
  • key k8s-upgrade-gce.yaml using file config/jobs/kubernetes/sig-cluster-lifecycle/k8s-upgrade-gce.yaml
  • key kubernetes-builds.yaml using file config/jobs/kubernetes/sig-release/kubernetes-builds.yaml
  • key sig-storage-gce-config.yaml using file config/jobs/kubernetes/sig-storage/sig-storage-gce-config.yaml
  • key typecheck.yaml using file config/jobs/kubernetes/sig-testing/typecheck.yaml
  • key gce-conformance.yaml using file config/jobs/kubernetes/sig-gcp/gce-conformance.yaml
  • key coverage.yaml using file config/jobs/kubernetes/sig-testing/coverage.yaml
  • key test-infra-presubmits.yaml using file config/jobs/kubernetes/test-infra/test-infra-presubmits.yaml
  • key kubeflow-presubmits.yaml using file config/jobs/kubeflow/kubeflow-presubmits.yaml
  • key cluster-api-provider-aws-presubmits.yaml using file config/jobs/kubernetes-sigs/cluster-api-provider-aws/cluster-api-provider-aws-presubmits.yaml
  • key cloud-provider-vsphere-presubmits.yaml using file config/jobs/kubernetes/cloud-provider-vsphere/cloud-provider-vsphere-presubmits.yaml
  • key kubeadm.yaml using file config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm.yaml

In response to this:

/assign

So since @amwat had two bumps in his branch... what I did:

# Move back beyond the previous conflict bump
git reset HEAD~30 --hard

# checkout the PR
git checkout -b amwat-remove-1.10 master
git pull https://github.com/amwat/test-infra.git remove-1.10

# try to bump to previous 
(hard-coded TAG=`v20190214-f4092ae69`)
./experiment/bump_e2e_image.sh

# sync HEAD
git rebase upstream/master

# bump again
./experiment/bump_e2e_image.sh

and I also made a few changes on top of the original PR to fix the wrong image mappings

cc @imkin @BenTheElder @spiffxp

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@krzyzacy krzyzacy deleted the krzyzacy:amwat-remove-1.10 branch Feb 20, 2019

@krzyzacy

This comment has been minimized.

Copy link
Member Author

krzyzacy commented Feb 20, 2019

looks like the testgrid dashboard will need a bit more work, will check back the status in a bit.

@amwat

This comment has been minimized.

Copy link
Contributor

amwat commented Feb 20, 2019

Thanks a lot for taking care of this !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.