Skip to content

skip test if not linux + hack/Makefile cleanups#595

Merged
openshift-merge-robot merged 4 commits intoopenshift:masterfrom
runcom:osx-tests
Apr 3, 2019
Merged

skip test if not linux + hack/Makefile cleanups#595
openshift-merge-robot merged 4 commits intoopenshift:masterfrom
runcom:osx-tests

Conversation

@runcom
Copy link
Copy Markdown
Member

@runcom runcom commented Apr 2, 2019

I'm occasionally developing from a mac, and found out that test is
failing cause it's assuming we're on linux and the kernel wrote the boot
id under /proc. It's not the case on osx so just skip the test if that
file isn't there.

The second commit accounts for an empty rev-parse --show-cdup on osx, and fixes that by testing the path to cd (which is not changing behavior on linux)

The other commits are doing a pass over a cleanup in hack and Makefile in order to start addressing #447 - specifically, we need to avoid stuff like #596

Signed-off-by: Antonio Murdaca runcom@linux.com

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 2, 2019
@openshift-ci-robot 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. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 2, 2019
@runcom runcom changed the title pkg/daemon: skip test if not on linux skip test if not linux + hack/Makefile cleanups Apr 2, 2019
runcom added 3 commits April 2, 2019 14:33
I'm occasionally developing from a mac, and found out that test is
failing cause it's assuming we're on linux and the kernel wrote the boot
id under /proc. It's not the case on osx so just skip the test if that
file isn't there.

Signed-off-by: Antonio Murdaca <runcom@linux.com>
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Call can fail if network is off try reaching the nodes as happened in
https://openshift-gce-devel.appspot.com/build/origin-ci-test/pr-logs/pull/openshift_machine-config-operator/595/pull-ci-openshift-machine-config-operator-master-e2e-aws-op/1349
so just return  false, nil as we do in other places where we know there
may be a network error.

Signed-off-by: Antonio Murdaca <runcom@linux.com>
@runcom runcom force-pushed the osx-tests branch 2 times, most recently from c0297fa to e95786a Compare April 2, 2019 12:38
@runcom
Copy link
Copy Markdown
Member Author

runcom commented Apr 2, 2019

This is also needed for openshift/release#3332

so we can have a verify job which just calls make verify from this which is verifying we never have issues like #596 - in the future, we can add gofmt/vet and other checks as well

@runcom runcom force-pushed the osx-tests branch 2 times, most recently from 89982e2 to c390d03 Compare April 2, 2019 13:26
Signed-off-by: Antonio Murdaca <runcom@linux.com>
@runcom
Copy link
Copy Markdown
Member Author

runcom commented Apr 2, 2019

/retest

@LorbusChris
Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 2, 2019
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: LorbusChris, runcom

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:

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

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@LorbusChris
Copy link
Copy Markdown
Contributor

/test e2e-aws

@kikisdeliveryservice
Copy link
Copy Markdown
Contributor

these failures have nothing to do with this PR. I'll check the forums to see if they are already reported.

ill retest later.

@kikisdeliveryservice
Copy link
Copy Markdown
Contributor

a similar failure has been reported in BZ 1695278. It seems to be happening on every run, so no point of mashing retest.

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@kikisdeliveryservice
Copy link
Copy Markdown
Contributor

openshift-bot is trolling me. 🤣

@runcom
Copy link
Copy Markdown
Member Author

runcom commented Apr 2, 2019

/retest

1 similar comment
@runcom
Copy link
Copy Markdown
Member Author

runcom commented Apr 2, 2019

/retest

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 5848c8d into openshift:master Apr 3, 2019
@runcom runcom deleted the osx-tests branch April 3, 2019 06:38
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/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants