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

leverage new source-to-image API around git clone spec validation/correction #5863

Merged
merged 2 commits into from Nov 14, 2015

Conversation

gabemontero
Copy link
Contributor

@bparees @csrwng revision 2 of the origin side changes for leveraging the improved git clone spec validation.

PTAL - thx

args: []string{".", testDir, "git://server/repo.git"},
repos: util.StringList([]string{".", testDir, "git://server/repo.git"}),
args: []string{".", testDir, "git://github.com/openshift/origin.git"},
repos: util.StringList([]string{".", testDir, "git://github.com/openshift/origin.git"}),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if this test is going to end up cloning this repo, we should pick a smaller one. origin is huge.

@gabemontero
Copy link
Contributor Author

responses to comments pushed

@gabemontero
Copy link
Contributor Author

[test]

@gabemontero
Copy link
Contributor Author

fyi - the test failure above was e2e-docker ... failure to connect to a container ... seems unrelated to this change.

@gabemontero
Copy link
Contributor Author

update for forcePull to pullPolicy pushed

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test Waiting: Determining build queue position

} else {
config.PreviousImagePullPolicy = s2iapi.PullIfNotPresent
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't we also stop setting ForcePull above?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(and make this if be based on s.build.Spec.Strategy.SourceStrategy.ForcePull)

@bparees
Copy link
Contributor

bparees commented Nov 12, 2015

one nit and lgtm.

@gabemontero
Copy link
Contributor Author

update for force pull / pull policy nit pushed

@bparees
Copy link
Contributor

bparees commented Nov 12, 2015

lgtm, but this would probably be a good time to run your extended tests that exercise the forcepull flag :)

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test Running (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/7125/) (Extended Tests: core(forcepull), forcepull)

@mfojtik
Copy link
Member

mfojtik commented Nov 12, 2015

hold on merge, will review this tomorrow
On Nov 12, 2015 9:20 PM, "OpenShift Bot" notifications@github.com wrote:

continuous-integration/openshift-jenkins/testonlyextended FAILURE (
https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/7095/)
(Extended Tests: core(forcepull)


Reply to this email directly or view it on GitHub
#5863 (comment).

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test Running (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/7132/) (Extended Tests: core(forcepull), forcepull)

@gabemontero
Copy link
Contributor Author

@bparees @mfojtik - the forcepull extended test actually passed. I'll paste a copule of snippets from the jenkins console:

  1. ok builds: forcepull: ForcePull from OpenShift induced builds (vs. s2i command) ForcePull test context ... (9m42.32619836s)
  2. Skipping SSH core dump, which is not implemented for --- PASS: TestExtended (582.46s)

The failure stems from some hiccups with rsync in copying the logs files.

Are we still holding on merge based on @mfojtik 's request ?

config.PreviousImagePullPolicy = s2iapi.PullAlways
config.BuilderPullPolicy = s2iapi.PullAlways
} else {
glog.V(4).Infof("With force pull false, setting policies to %s", s2iapi.PullAlways)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PullIfNotPresent

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ahh ... ok, just pushed

@openshift-bot
Copy link
Contributor

Evaluated for origin testonlyextended up to 891fc21

@bparees
Copy link
Contributor

bparees commented Nov 13, 2015

@mfojtik if you have comments we'll handle them in a follow up.
[merge]

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_origin/4012/) (Image: devenv-rhel7_2709)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 891fc21

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test Running (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/7138/) (Extended Tests: core(forcepull))

@gabemontero
Copy link
Contributor Author

hmmm - same scenario ... tests passed, rsync of logs failed ... also, the test infrastructure is trying to call forcepull.sh (and it appears as if the extended tests are still running with a forcepull focus ... perhaps the prior forcepull only run has left a bit set somewhere). The message after only running the forcepull test:

Running TEST_REPORT_DIR=/tmp/openshift-extended-tests/junit/extended test/extended/forcepull.sh...

forcepull.sh used to exist, but was deleted as part of one of the extended test refactors; i would have to dig some more to see if the missing forcepull.sh is related to the rsync failures, and if it makes sense to add a forcepull.sh back in.

I'm thinking of trying a full extended test run manually first (perhaps unset the run only forcepull bit if my theory is correct).

@bparees thoughts when you get the chance

@bparees
Copy link
Contributor

bparees commented Nov 13, 2015

@gabemontero it's trying to call forcepull.sh because of your comment above where you named it as the extended test to run. the bot aggregrates all the test tags. delete that comment and it'll stop trying to call forcepull.sh.

@gabemontero
Copy link
Contributor Author

ok ... so my theory was correct - didn't think about the delete comment though - thx

@gabemontero
Copy link
Contributor Author

[test]

@bparees
Copy link
Contributor

bparees commented Nov 13, 2015

also the rsync of the logs didn't fail in general, it just didn't find certain directories because you didn't run those tests. that isn't causing the build failure, the build failure is because forcepull.sh wasn't found, so that's a failure code.

So i think once you remove your extended:forcepull comment, and then add another test tag so it reruns, you'll get a clean run.

@bparees
Copy link
Contributor

bparees commented Nov 13, 2015

@gabemontero i'm not sure how test and testonlyextended interact since they are basically opposites. you probably want:
|test||extended:core(forcepull)| or you want |testonlyextended||extended:core(forcepull)|

(with brackets instead of pipes of course. just trying to avoid messing up your PR)

@bparees
Copy link
Contributor

bparees commented Nov 13, 2015

or you can just watch it and see what happens and then we'll learn something.

@bparees
Copy link
Contributor

bparees commented Nov 13, 2015

[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 891fc21

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/7141/)

openshift-bot pushed a commit that referenced this pull request Nov 14, 2015
@openshift-bot openshift-bot merged commit f0e6b55 into openshift:master Nov 14, 2015
@gabemontero gabemontero deleted the bugzilla1268478-2 branch November 14, 2015 06:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants