Create and use a test entrypoint in templatized e2e #1527

stevekuznetsov · 2018-09-18T05:15:58Z

/assign @smarterclayton
/cc @bbguimaraes

Did the edits to the prowjob yaml with:

#!/usr/bin/env python

import sys
import yaml

print sys.argv[1]

data = {}
edited = False
with open(sys.argv[1]) as f:
	data = yaml.load(f)
	for job_type in data:
		for repo in data[job_type]:
			for job in data[job_type][repo]:
				if job["agent"] != "kubernetes":
					continue

				for mount in job["spec"]["containers"][0].get("volumeMounts", []):
					if mount["name"] == "job-definition":
						if mount["subPath"] in ["cluster-launch-e2e-gmontero-testing.yaml", "cluster-launch-e2e-openshift-ansible.yaml", "cluster-launch-e2e-upgrade.yaml", "cluster-launch-e2e.yaml", "cluster-launch-installer-e2e.yaml", "cluster-launch-e2e-azure-conformance.yaml"]:
							filtered_env = []
							command = ""
							for env in job["spec"]["containers"][0].get("env", []):
								if env["name"] in ["TEST_FOCUS", "TEST_FOCUS_SERIAL", "TEST_SKIP", "TEST_SKIP_SERIAL"]:
									command += "{}={} ".format(env["name"], env["value"])
									edited = True
								else:
									filtered_env.append(env)
							command += "run-tests"
							filtered_env.append({"name": "TEST_COMMAND", "value": command})
							job["spec"]["containers"][0]["env"] = filtered_env

if edited:
	with open(sys.argv[1], 'w') as f:
		f.write(yaml.dump(data))

openshift-ci-robot · 2018-09-18T05:16:02Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: stevekuznetsov

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [stevekuznetsov]

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

ci-operator/jobs/openshift/builder/openshift-builder-presubmits.yaml

smarterclayton · 2018-09-18T07:15:15Z

/hold

need to discuss, I don't understand why this is improved. No one should be running custom test suites with e2e-gcp or e2e-aws.

stevekuznetsov · 2018-09-19T15:27:38Z

/hold cancel

after talk this morning
@smarterclayton let's merge?

smarterclayton · 2018-09-19T20:19:47Z

ci-operator/jobs/openshift/openshift-azure/openshift-openshift-azure-presubmits.yaml

Is this still correct when executed as a bash script?

smarterclayton · 2018-09-19T20:20:59Z

ci-operator/templates/cluster-launch-e2e-openshift-ansible.yaml

Launch doesn’t run tests, so this container shouldn’t be here

smarterclayton · 2018-09-19T20:21:14Z

ci-operator/templates/openshift/openshift-azure/cluster-launch-e2e-azure-conformance.yaml

You checked in a merge conflict

smarterclayton · 2018-09-19T20:21:53Z

ci-operator/templates/openshift/openshift-azure/cluster-launch-e2e-azure-conformance.yaml

Looks like you lost this?

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>

stevekuznetsov · 2018-09-20T16:35:26Z

I think this is fine now

openshift-ci-robot · 2018-09-20T16:40:02Z

@stevekuznetsov: Updated the following 8 configmaps:

prow-job-cluster-launch-e2e configmap using the following files:
- key cluster-launch-e2e.yaml using file ci-operator/templates/cluster-launch-e2e.yaml
prow-job-cluster-launch-installer-e2e configmap using the following files:
- key cluster-launch-installer-e2e.yaml using file ci-operator/templates/cluster-launch-installer-e2e.yaml
prow-job-cluster-launch-src configmap using the following files:
- key cluster-launch-src.yaml using file ci-operator/templates/cluster-launch-src.yaml
prow-job-cluster-launch-e2e-azure-conformance configmap using the following files:
- key cluster-launch-e2e-azure-conformance.yaml using file ci-operator/templates/openshift/openshift-azure/cluster-launch-e2e-azure-conformance.yaml
job-config configmap using the following files:
- key openshift-installer-presubmits.yaml using file ci-operator/jobs/openshift/installer/openshift-installer-presubmits.yaml
- key openshift-jenkins-presubmits.yaml using file ci-operator/jobs/openshift/jenkins/openshift-jenkins-presubmits.yaml
- key openshift-openshift-ansible-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-presubmits-release-3.11.yaml
- key openshift-openshift-azure-periodics.yaml using file ci-operator/jobs/openshift/openshift-azure/openshift-openshift-azure-periodics.yaml
- key openshift-openshift-azure-presubmits.yaml using file ci-operator/jobs/openshift/openshift-azure/openshift-openshift-azure-presubmits.yaml
- key openshift-origin-web-console-server-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-presubmits-release-3.11.yaml
- key openshift-origin-web-console-server-presubmits.yaml using file ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-presubmits.yaml
- key openshift-origin-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/origin/openshift-origin-presubmits-release-3.11.yaml
- key openshift-builder-presubmits.yaml using file ci-operator/jobs/openshift/builder/openshift-builder-presubmits.yaml
- key openshift-image-registry-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/image-registry/openshift-image-registry-presubmits-release-3.11.yaml
- key openshift-image-registry-presubmits.yaml using file ci-operator/jobs/openshift/image-registry/openshift-image-registry-presubmits.yaml
- key openshift-openshift-ansible-presubmits.yaml using file ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-presubmits.yaml
- key openshift-origin-presubmits.yaml using file ci-operator/jobs/openshift/origin/openshift-origin-presubmits.yaml
prow-job-cluster-launch-e2e-gmontero-testing configmap using the following files:
- key cluster-launch-e2e-gmontero-testing.yaml using file ci-operator/templates/cluster-launch-e2e-gmontero-testing.yaml
prow-job-cluster-launch-e2e-openshift-ansible configmap using the following files:
- key cluster-launch-e2e-openshift-ansible.yaml using file ci-operator/templates/cluster-launch-e2e-openshift-ansible.yaml
prow-job-cluster-launch-e2e-upgrade configmap using the following files:
- key cluster-launch-e2e-upgrade.yaml using file ci-operator/templates/cluster-launch-e2e-upgrade.yaml

Details

In response to this:

/assign @smarterclayton
/cc @bbguimaraes

Did the edits to the prowjob yaml with:

#!/usr/bin/env python

import sys
import yaml

print sys.argv[1]

data = {}
edited = False
with open(sys.argv[1]) as f:
  data = yaml.load(f)
  for job_type in data:
  	for repo in data[job_type]:
  		for job in data[job_type][repo]:
  			if job["agent"] != "kubernetes":
  				continue

  			for mount in job["spec"]["containers"][0].get("volumeMounts", []):
  				if mount["name"] == "job-definition":
  					if mount["subPath"] in ["cluster-launch-e2e-gmontero-testing.yaml", "cluster-launch-e2e-openshift-ansible.yaml", "cluster-launch-e2e-upgrade.yaml", "cluster-launch-e2e.yaml", "cluster-launch-installer-e2e.yaml", "cluster-launch-e2e-azure-conformance.yaml"]:
  						filtered_env = []
  						command = ""
  						for env in job["spec"]["containers"][0].get("env", []):
  							if env["name"] in ["TEST_FOCUS", "TEST_FOCUS_SERIAL", "TEST_SKIP", "TEST_SKIP_SERIAL"]:
  								command += "{}={} ".format(env["name"], env["value"])
  								edited = True
  							else:
  								filtered_env.append(env)
  						command += "run-tests"
  						filtered_env.append({"name": "TEST_COMMAND", "value": command})
  						job["spec"]["containers"][0]["env"] = filtered_env

if edited:
  with open(sys.argv[1], 'w') as f:
  	f.write(yaml.dump(data))

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.

stevekuznetsov · 2018-09-20T16:51:49Z

@bparees @gabemontero @vrutkovs @Kargakis @sallyom this changes how ginkgo is run in the tests, but should not actually change what tests execute -- let me know if there are adverse effects

0xmichalis · 2018-09-20T16:59:32Z

@mjudeikis fyi

…s/test-entrypoint" This reverts commit bf5ea7d, reversing changes made to caf44c3. Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>

openshift-ci-robot assigned smarterclayton Sep 18, 2018

openshift-ci-robot requested a review from bbguimaraes September 18, 2018 05:15

openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 18, 2018

stevekuznetsov force-pushed the skuznets/test-entrypoint branch from e66e1a6 to c889d01 Compare September 18, 2018 05:18

stevekuznetsov commented Sep 18, 2018

View reviewed changes

ci-operator/jobs/openshift/builder/openshift-builder-presubmits.yaml Outdated Show resolved Hide resolved

smarterclayton reviewed Sep 18, 2018

View reviewed changes

ci-operator/jobs/openshift/builder/openshift-builder-presubmits.yaml Outdated Show resolved Hide resolved

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 18, 2018

stevekuznetsov force-pushed the skuznets/test-entrypoint branch from c889d01 to b4e3cab Compare September 19, 2018 15:27

openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 19, 2018

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 19, 2018

stevekuznetsov force-pushed the skuznets/test-entrypoint branch from b4e3cab to e2ee519 Compare September 19, 2018 15:30

openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 19, 2018

openshift-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 19, 2018

smarterclayton suggested changes Sep 19, 2018

View reviewed changes

stevekuznetsov added 2 commits September 20, 2018 07:34

Add a test entrypoint to the e2e templates

708252c

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>

Use the test entrypoint

305d2a5

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>

stevekuznetsov force-pushed the skuznets/test-entrypoint branch from e2ee519 to 305d2a5 Compare September 20, 2018 14:35

stevekuznetsov added the lgtm Indicates that a PR is ready to be merged. label Sep 20, 2018

openshift-merge-robot merged commit bf5ea7d into openshift:master Sep 20, 2018

bbguimaraes mentioned this pull request Oct 3, 2018

Create and use a test entrypoint in templatized e2e #1799

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Create and use a test entrypoint in templatized e2e #1527

Create and use a test entrypoint in templatized e2e #1527

Uh oh!

stevekuznetsov commented Sep 18, 2018

Uh oh!

openshift-ci-robot commented Sep 18, 2018

Uh oh!

Uh oh!

Uh oh!

smarterclayton commented Sep 18, 2018

Uh oh!

stevekuznetsov commented Sep 19, 2018

Uh oh!

smarterclayton Sep 19, 2018

Uh oh!

smarterclayton Sep 19, 2018

Uh oh!

smarterclayton Sep 19, 2018

Uh oh!

smarterclayton Sep 19, 2018

Uh oh!

stevekuznetsov commented Sep 20, 2018

Uh oh!

openshift-ci-robot commented Sep 20, 2018

Uh oh!

stevekuznetsov commented Sep 20, 2018

Uh oh!

0xmichalis commented Sep 20, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Create and use a test entrypoint in templatized e2e #1527

Create and use a test entrypoint in templatized e2e #1527

Uh oh!

Conversation

stevekuznetsov commented Sep 18, 2018

Uh oh!

openshift-ci-robot commented Sep 18, 2018

Uh oh!

Uh oh!

Uh oh!

smarterclayton commented Sep 18, 2018

Uh oh!

stevekuznetsov commented Sep 19, 2018

Uh oh!

smarterclayton Sep 19, 2018

Choose a reason for hiding this comment

Uh oh!

smarterclayton Sep 19, 2018

Choose a reason for hiding this comment

Uh oh!

smarterclayton Sep 19, 2018

Choose a reason for hiding this comment

Uh oh!

smarterclayton Sep 19, 2018

Choose a reason for hiding this comment

Uh oh!

stevekuznetsov commented Sep 20, 2018

Uh oh!

openshift-ci-robot commented Sep 20, 2018

Uh oh!

stevekuznetsov commented Sep 20, 2018

Uh oh!

0xmichalis commented Sep 20, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants