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

[Fixes #481] remove add registry sidecar from docker-build tests #491

Merged
merged 1 commit into from
Aug 31, 2020

Conversation

popcor255
Copy link
Member

@popcor255 popcor255 commented Aug 12, 2020

Changes

Overview

  • Removed docker-build from skip task
  • Removed add_sidecar_registry from tests
  • Added a deployment with an image registry instead of sidecar.

Summary

The end to end test attaches a sidecar with a image registry for tasks to push into to. This task is optional and is encouraged to be used for testing. However, the function add_sidecar_registry sets the sidecar registry instead of appending it. Not using the tasks will fix the test #481

TLDR;

Script sets sidecar equal to an object instead of appending it. So, Im not going to use it in my test.

@tekton-robot tekton-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 12, 2020
@popcor255
Copy link
Member Author

/assign @chmouel

@popcor255
Copy link
Member Author

/assign @imjasonh

test/e2e-common.sh Outdated Show resolved Hide resolved
@popcor255
Copy link
Member Author

/hold

@tekton-robot tekton-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 12, 2020
@tekton-robot tekton-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 12, 2020
@popcor255
Copy link
Member Author

popcor255 commented Aug 12, 2020

🤦 This is why its one line...

++ python3 utils.py add_sidecar_to_yaml_file
python3: can't open file 'utils.py': [Errno 2] No such file or directory

@tekton-robot tekton-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 12, 2020
@popcor255 popcor255 requested review from chmouel and imjasonh August 12, 2020 06:21
@chmouel
Copy link
Member

chmouel commented Aug 12, 2020

This sounds good, thanks for doign this refactoring, any chances if you can squash the commits ? (preferrably if you can separate the refactoring from the fix but that's not absolutely necessary). thanks!

@vinamra28
Copy link
Member

probably fetching the latest commits from upstream and rebasing the PR would help fix the CI

test/utils.py Outdated Show resolved Hide resolved
test/e2e-common.sh Outdated Show resolved Hide resolved
@tekton-robot tekton-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 12, 2020
@popcor255 popcor255 requested a review from imjasonh August 12, 2020 19:10
@popcor255
Copy link
Member Author

/test pull-tekton-catalog-integration-tests

@tekton-robot tekton-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 14, 2020
@popcor255 popcor255 force-pushed the patch-issue-481 branch 2 times, most recently from 7eed158 to 3a5d60a Compare August 14, 2020 20:22
@popcor255
Copy link
Member Author

popcor255 commented Aug 14, 2020

@vinamra28 @imjasonh @afrittoli @chmouel YAY! YAML! 🎉 (could you take another look) 😉

@popcor255
Copy link
Member Author

how do i remove hold 😿

@popcor255
Copy link
Member Author

/unhold

@popcor255
Copy link
Member Author

/hold cancel

@tekton-robot tekton-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 14, 2020
@popcor255
Copy link
Member Author

/test pull-tekton-catalog-integration-tests

1 similar comment
@popcor255
Copy link
Member Author

/test pull-tekton-catalog-integration-tests

@popcor255 popcor255 requested a review from imjasonh August 24, 2020 13:13
@popcor255 popcor255 changed the title (Fixes #481) prevent e2e-test script from overriding task sidecar (Fixes #481) remove add registry sidecar from docker-build tests Aug 24, 2020
@popcor255 popcor255 changed the title (Fixes #481) remove add registry sidecar from docker-build tests [Fixes #481] remove add registry sidecar from docker-build tests Aug 24, 2020
The end to end test attaches a sidecar with a image registry for tasks to push into to. However, the function add_sidecar_registry sets the sidecar registry instead of appending it. Removing the function from test to remove this bug. There is a local registry being added to the test that is deployed with deployment and svc. The svc is referenced during the test instead of the sidecar. tektoncd#481
@imjasonh
Copy link
Member

/lgtm

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 25, 2020
@piyush-garg
Copy link
Contributor

/lgtm

@popcor255
Copy link
Member Author

/assign @chmouel

@chmouel
Copy link
Member

chmouel commented Aug 31, 2020

/lgtm
/approve

Let's see how it goes!

@tekton-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chmouel

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

@tekton-robot tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 31, 2020
@tekton-robot tekton-robot merged commit a9600e0 into tektoncd:master Aug 31, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants