-
Notifications
You must be signed in to change notification settings - Fork 12
CFE-1100: UPSTREAM: <carry>: Add downstream e2e tests #12
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
Conversation
@chiragkyal: This pull request references CFE-1100 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.18.0" version, but no target version was set. In response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
Skipping CI for Draft Pull Request. |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: chiragkyal 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 |
/test images |
/test all |
@chiragkyal Let's add the CI config to get this test running on the main branch PRs. |
/hold |
.PHONY: ansible-operator | ||
ANSIBLE_OPERATOR = $(shell pwd)/bin/ansible-operator | ||
ansible-operator: ## Download ansible-operator locally if necessary, preferring the $(pwd)/bin path over global if both exist. | ||
ifeq (,$(wildcard $(ANSIBLE_OPERATOR))) | ||
ifeq (,$(shell which ansible-operator 2>/dev/null)) | ||
@{ \ | ||
set -e ;\ | ||
mkdir -p $(dir $(ANSIBLE_OPERATOR)) ;\ | ||
curl -sSLo $(ANSIBLE_OPERATOR) https://github.com/operator-framework/operator-sdk/releases/download/v1.31.0/ansible-operator_$(OS)_$(ARCH) ;\ | ||
chmod +x $(ANSIBLE_OPERATOR) ;\ | ||
} | ||
else | ||
ANSIBLE_OPERATOR = $(shell which ansible-operator) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I want to take a closer look if this can be removed / updated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is generated when using code scaffolding for creating the testdata directory. This is not used in the e2e script that you added.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@chiragkyal Are you planning to make any changes here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've commented out ansible-operator, operator-sdk, opm targets in 4027222
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please also ensure other make targets are not impacted by removal of the above targets.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've made some clean up in 22b4c24 so that other (necessary) make targets are not impacted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This discussion is now outdated because of #12 (comment). The hack/generate/samples/generate_testdata.go
script does it out of the box.
/test ? |
@arkadeepsen: The following commands are available to trigger required jobs:
Use In response to this:
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-sigs/prow repository. |
/test e2e-ansible |
/test images |
@chiragkyal: This pull request references CFE-1100 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.18.0" version, but no target version was set. In response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
/hold cancel |
@chiragkyal: This pull request references CFE-1100 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.18.0" version, but no target version was set. In response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
As discussed, I've scaffolded the testdata using |
/retest |
/lgtm |
/cc @KeenonLee |
|
||
# Install oc client | ||
if ! [ -x "$(command -v oc)" ]; then | ||
curl -Lo oc.tar.gz https://github.com/openshift/origin/releases/download/v3.11.0/openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit.tar.gz |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this refer to latest openshift release?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, updated to "4.16.0"
/hold |
/label qe-approved |
@chiragkyal: This pull request references CFE-1100 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.18.0" version, but no target version was set. In response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
# Install oc client | ||
if ! [ -x "$(command -v oc)" ]; then | ||
OPENSHIFT_CLIENT_VERSION="4.16.0" | ||
curl -Lo oc.tar.gz https://mirror.openshift.com/pub/openshift-v4/clients/ocp/$OPENSHIFT_CLIENT_VERSION/openshift-client-linux-$OPENSHIFT_CLIENT_VERSION.tar.gz |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Better to use curly braces for the shell parameter expansion to avoid issues and confusion: https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html
curl -Lo oc.tar.gz https://mirror.openshift.com/pub/openshift-v4/clients/ocp/$OPENSHIFT_CLIENT_VERSION/openshift-client-linux-$OPENSHIFT_CLIENT_VERSION.tar.gz | |
curl -Lo oc.tar.gz https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OPENSHIFT_CLIENT_VERSION}/openshift-client-linux-${OPENSHIFT_CLIENT_VERSION}.tar.gz |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the suggestion, updated to use ${parameter}
Signed-off-by: chiragkyal <ckyal@redhat.com>
/unhold |
@chiragkyal: all tests passed! Full PR test history. Your PR dashboard. 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-sigs/prow repository. I understand the commands that are listed here. |
/lgtm |
/cherrypick release-4.17 |
@arkadeepsen: new pull request created: #17 In response to this:
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-sigs/prow repository. |
[ART PR BUILD NOTIFIER] Distgit: openshift-enterprise-ansible-operator |
Description of the change:
This PR
openshift/ci/testdata/ansible/memcached-operator
which is equivalent to https://github.com/openshift/ocp-release-operator-sdk/tree/master/testdata/ansible/memcached-operator but was scaffolded using OSDK1.36.1
.Steps followed
Operator SDK
Binaryv1.36.1
hack/generate/samples/generate_testdata.go
scriptMemcachedSample
instead ofMoleculeSample
to be used in the e2e job.generate_testdata.go
. We can follow up on creating the testdata without applying this patch.openshift/ci/dockerfiles/ansible-e2e.Dockerfile
which is equivalent to https://github.com/openshift/ocp-release-operator-sdk/blob/d147fd3b63cf4a6bc4c1d9168f5388f2da102505/ci/dockerfiles/ansible-e2e.Dockerfile#L1openshift/ci/tests/e2e-ansible-scaffolding.sh
from https://github.com/openshift/ocp-release-operator-sdk/blob/d147fd3b63cf4a6bc4c1d9168f5388f2da102505/ci/tests/e2e-ansible-scaffolding.sh#L1make install
which is not required for running the teststest-e2e-ansible
target insideopenshift/Makefile
to run the script.Motivation for the change:
Add existing downstream e2e tests