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.

Sign up for GitHub

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

Jump to bottom

tests/run: Use one Python invocation (no jq) for editing the config #166

Merged
merged 1 commit into from
Aug 24, 2018
Merged

tests/run: Use one Python invocation (no jq) for editing the config #166

merged 1 commit into from
Aug 24, 2018

Conversation

wking
Copy link
Member

@wking wking commented Aug 23, 2018

We've used the Python -> jq (-> jq) -> Python approach to editing the config file since this script landed in a2405e4 (coreos/tectonic-installer#3284). But it's more efficient and almost equally compact to perform those edits directly in Python.

This commit uses a here-document to inject the Python script.

Once this PR lands, I'll file follow-up work to add expirationDate to extraTags (like we have for the e2e-aws tests since openshift/release#1103).

@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Aug 23, 2018
@wking
Copy link
Member Author

wking commented Aug 24, 2018

retest this please

@crawford
Copy link
Contributor

Can we merge this after #162 (assuming the tests pass on this round)?

@wking
Copy link
Member Author

wking commented Aug 24, 2018

Can we merge this after #162...

Fine with me :)

@crawford
Copy link
Contributor

retest this please

@crawford
Copy link
Contributor

The tests on #162 are still giving me trouble.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 24, 2018
@wking
Copy link
Member Author

wking commented Aug 24, 2018

The Jenkins error is:

time="2018-08-24T03:46:47Z" level=error msg="Found 1 error in the cluster definition:" 
time="2018-08-24T03:46:47Z" level=error msg="error 1: open : no such file or directory"

That may be a real thing; I'll check in the morning.

@wking wking force-pushed the smoke-test-one-python branch from 64ba786 to d8f296c Compare August 24, 2018 05:49
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Aug 24, 2018
@wking
Copy link
Member Author

wking commented Aug 24, 2018 

time="2018-08-24T03:46:47Z" level=error msg="error 1: open : no such file or directory"

Heh, I'd accidentally dropped the pull-secret update. Fixed with 64ba786 -> d8f296c. This sort of thing will be easier to spot once we address #108.

@crawford
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 24, 2018
@wking
tests/run: Use one Python invocation (no jq) for editing the config
58bc279 
We've used the Python -> jq (-> jq) -> Python approach to editing the
config file since this script landed in a2405e4 (run smoke tests with
bash script, 2018-06-18, coreos/tectonic-installer#3284).  But it's
more efficient and almost equally compact to perform those edits
directly in Python.

This commit uses a here-document [1] to inject the Python script.

[1]: http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_07_04
@wking wking force-pushed the smoke-test-one-python branch from d8f296c to 58bc279 Compare August 24, 2018 14:23
@wking
Copy link
Member Author

wking commented Aug 24, 2018

Rebased around #162 with d8f296c -> 58bc279.

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Aug 24, 2018
@crawford
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 24, 2018
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: crawford, wking

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

@openshift-merge-robot openshift-merge-robot merged commit 714b2e2 into openshift:master Aug 24, 2018
@wking wking deleted the smoke-test-one-python branch August 24, 2018 16:25
@wking
Copy link
Member Author

wking commented Aug 24, 2018

Once this PR lands, I'll file follow-up work to add expirationDate to extraTags...

Filed as #169.

@kikisdeliveryservice kikisdeliveryservice mentioned this pull request Feb 1, 2019
Merged
kikisdeliveryservice added a commit to kikisdeliveryservice/installer that referenced this pull request Feb 12, 2019
@kikisdeliveryservice
change machine-config-server port
ab09bc2 
Change machine-config-server port from 49500 -> 22623
to avoid conflict with local port and node port ranges.

Closes machine-config-operator issue: openshift#166
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

@yifan-gu yifan-gu Awaiting requested review from yifan-gu

Assignees

@crawford crawford

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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@wking @crawford @openshift-ci-robot @openshift-merge-robot