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

Migrate jobs to use --test_args instead of GINKGO_TEST_ARGS and SKEW_KUBECTL #3309

Merged
merged 3 commits into from
Jul 6, 2017

Conversation

fejta
Copy link
Contributor

@fejta fejta commented Jul 5, 2017

ref #2829
/assign @yguo0905 @krzyzacy

Also fixed etcd upgrade and gke-large jobs that try to set --test_args when --test=false

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 5, 2017
@yguo0905
Copy link
Contributor

yguo0905 commented Jul 5, 2017

The changes in experimental/test_config.yaml and jobs/[image|suite|platform]/*.env look good!

autoscaling:
args:
- --timeout=300m
- --ginkgo.focus=\[Feature:ClusterSizeAutoscalingScaleUp\]|\[Feature:ClusterSizeAutoscalingScaleDown\] --ginkgo.skip=\[Flaky\]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wonder if one line is ok, or it need to be two flags --ginkgo.focus and --ginkgo.skip separately

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

--test_args=...?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah @yguo0905 you got better eyes :-)

@@ -1,2 +1 @@
GINKGO_TEST_ARGS=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]
GINKGO_PARALLEL=y
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the file only contains GINKGO_PARALLEL=y now.. maybe have a --parallel=true flag instead? thoughts?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but can I do this in a separate PR?

This is deceptively complicated as this var is processed by ginkgo-e2e.sh, not e2e-runner.sh nor kubetest

Copy link
Contributor Author

@fejta fejta Jul 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AKA this is not part of migrating e2e-runner.sh env to kubetest but the opposite (migrating ginkgo-e2e.sh stuff into kubetest)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ack - maybe just move the env to their original env files... those suite/*.env files are not loved anymore 🔥

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do this in a separate PR (delete the suite/*.env files and migrate their configs to the job.env)

jobs/config.json Outdated
@@ -270,7 +281,8 @@
"--extract=ci/latest-1.5",
"--extract=ci/latest-1.6",
"--check-leaked-resources",
"--check-version-skew=false"
"--check-version-skew=false",
"--test_args=None"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one seems wrong, should be --ginkgo.focus=\[Feature:ClusterDowngrade\] --upgrade-target=ci/latest-1.5 --gce-upgrade-script=/workspace/kubernetes_skew/cluster/gce/upgrade.sh --etcd-upgrade-storage=etcd2 --etcd-upgrade-version=2.2.1

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

problems.append('Cannot skew kubectl without tests %s' % job)
if tests:
problems.append('Cannot --test_args when --test=false %s' % job)
continue
Copy link
Member

@krzyzacy krzyzacy Jul 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe check if --test is true but --test_args is None here, that seems should not happen.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@fejta
Copy link
Contributor Author

fejta commented Jul 6, 2017

@yguo0905 any chance I can get an /lgtm? Sen is out the rest of this week

@yguo0905
Copy link
Contributor

yguo0905 commented Jul 6, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 6, 2017
@fejta fejta merged commit 7479ea8 into kubernetes:master Jul 6, 2017
@fejta fejta deleted the test branch July 6, 2017 21:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants