-
Notifications
You must be signed in to change notification settings - Fork 12
OAPE-36: Updates ansible-collections and downstream e2e test to match upstream v1.36.1 #35
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
44dd91c
UPSTREAM: <carry>: Updates `openshift/release/ansible/requirements.ym…
chiragkyal ff959b7
UPSTREAM: <carry>: Updates `openshift/release/ansible/ansible_collect…
chiragkyal fac3030
UPSTREAM: <carry>: Adds new Make targets `update-collections` and `ch…
chiragkyal 4fb1f64
UPSTREAM: <carry>: Updates downstream e2e test to use upstream `testd…
chiragkyal cdfba54
UPSTREAM: <carry>: Removes downstream testdata: `openshift/ci/testdat…
chiragkyal File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| # openshift-ansible-operator-plugins is built from the openshift/Dockerfile | ||
| FROM openshift-ansible-operator-plugins | ||
|
|
||
| COPY openshift/ci/testdata/ansible/memcached-operator/requirements.yml ${HOME}/requirements.yml | ||
| COPY testdata/memcached-molecule-operator/requirements.yml ${HOME}/requirements.yml | ||
| RUN ansible-galaxy collection install -r ${HOME}/requirements.yml \ | ||
| && chmod -R ug+rwx ${HOME}/.ansible | ||
|
|
||
| COPY openshift/ci/testdata/ansible/memcached-operator/watches.yaml ${HOME}/watches.yaml | ||
| COPY openshift/ci/testdata/ansible/memcached-operator/roles/ ${HOME}/roles/ | ||
| COPY openshift/ci/testdata/ansible/memcached-operator/playbooks/ ${HOME}/playbooks/ | ||
| COPY testdata/memcached-molecule-operator/watches.yaml ${HOME}/watches.yaml | ||
| COPY testdata/memcached-molecule-operator/roles/ ${HOME}/roles/ | ||
| COPY testdata/memcached-molecule-operator/playbooks/ ${HOME}/playbooks/ | ||
14 changes: 0 additions & 14 deletions
14
openshift/ci/testdata/ansible/memcached-operator/.gitignore
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
106 changes: 0 additions & 106 deletions
106
openshift/ci/testdata/ansible/memcached-operator/Makefile
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
44 changes: 0 additions & 44 deletions
44
...ci/testdata/ansible/memcached-operator/config/crd/bases/cache.example.com_memcacheds.yaml
This file was deleted.
Oops, something went wrong.
6 changes: 0 additions & 6 deletions
6
openshift/ci/testdata/ansible/memcached-operator/config/crd/kustomization.yaml
This file was deleted.
Oops, something went wrong.
28 changes: 0 additions & 28 deletions
28
openshift/ci/testdata/ansible/memcached-operator/config/default/kustomization.yaml
This file was deleted.
Oops, something went wrong.
40 changes: 0 additions & 40 deletions
40
...shift/ci/testdata/ansible/memcached-operator/config/default/manager_auth_proxy_patch.yaml
This file was deleted.
Oops, something went wrong.
10 changes: 0 additions & 10 deletions
10
openshift/ci/testdata/ansible/memcached-operator/config/default/manager_config_patch.yaml
This file was deleted.
Oops, something went wrong.
2 changes: 0 additions & 2 deletions
2
openshift/ci/testdata/ansible/memcached-operator/config/manager/kustomization.yaml
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
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.
Is there any path change in CI ?
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.
We don't need to change the CI job setup in https://github.com/openshift/release, because the make targets and Dockerfile paths remain unchanged.