s2i bump #12237

bparees · 2016-12-12T23:35:26Z

bparees · 2016-12-12T23:35:44Z

[testextended][extended:core(builds|image_ecosystem)]

bparees · 2016-12-12T23:35:47Z

[test]

bparees · 2016-12-14T02:48:26Z

@jim-minter assuming this passes tests now, ptal. particularly where i had to change to use CreateTarStream instead of StreamFileAsTarWithCallback

jim-minter · 2016-12-14T10:00:55Z

pkg/bootstrap/docker/dockerhelper/filetransfer.go

-	t := stitar.New()
-	err := t.StreamFileAsTarWithCallback(src, filepath.Base(dest), uploader, nullWalkFunc, false)
+	t := s2itar.New(s2iutil.NewFileSystem())
+	err := t.CreateTarStream(src, false, uploader)


err := t.CreateTarStream(src, false, uploader)

should read:

tarWriter := s2itar.RenameAdapter{Writer: tar.NewWriter(uploader), Old: filepath.Base(src), New: filepath.Base(dest)} err := t.CreateTarStreamToTarWriter(src, true, tarWriter, nil) if err == nil { err = tarWriter.Close() }

only close tarWriter if err is nil?

it's the best I could think of - tarWriter.Close() writes the terminating '\0's record which is supposed to indicate to tar that its stream isn't erroneously truncated.

that code is a copy/paste of the equivalent that I implemented in s2i

jim-minter · 2016-12-14T10:02:57Z

@bparees bar the above change, looks fine to me.

bparees · 2016-12-14T17:57:23Z

@jim-minter it seems plausible the latest s2i changes broke extended builds in origin... (see latest extended test failures)

bparees · 2016-12-14T22:12:35Z

2016-12-14T15:47:03.563740000Z I1214 15:47:03.562961       1 postexecutorstep.go:322] Uploading directory "/tmp/s2i-build213899081/upload/runtimeArtifacts" -> "/opt/jboss"
2016-12-14T15:47:03.564150000Z I1214 15:47:03.562992       1 docker.go:390] Uploading "/tmp/s2i-build213899081/upload/runtimeArtifacts" to "/opt" ...
2016-12-14T15:47:03.564468000Z I1214 15:47:03.563121       1 tar.go:199] Adding "/tmp/s2i-build213899081/upload/runtimeArtifacts" to tar ...
2016-12-14T15:47:03.564871000Z I1214 15:47:03.563441       1 tar.go:285] Adding to tar: /tmp/s2i-build213899081/upload/runtimeArtifacts/hello.jar as runtimeArtifacts/hello.jar
2016-12-14T15:47:03.565371000Z I1214 15:47:03.563711       1 tar.go:285] Adding to tar: /tmp/s2i-build213899081/upload/runtimeArtifacts/scripts/assemble-runtime as runtimeArtifacts/scripts/assemble-runtime
2016-12-14T15:47:03.565577000Z I1214 15:47:03.563926       1 tar.go:285] Adding to tar: /tmp/s2i-build213899081/upload/runtimeArtifacts/scripts/run as runtimeArtifacts/scripts/run
2016-12-14T15:47:03.603253000Z I1214 15:47:03.602678       1 postexecutorstep.go:328] Uploading file "/tmp/s2i-upload-done050185315" -> "/tmp/s2i-upload-done050185315"
2016-12-14T15:47:03.603597000Z I1214 15:47:03.602711       1 docker.go:390] Uploading "/tmp/s2i-upload-done050185315" to "/tmp" ...
2016-12-14T15:47:03.603925000Z I1214 15:47:03.602844       1 tar.go:199] Adding "/tmp/s2i-upload-done050185315" to tar ...
2016-12-14T15:47:03.604548000Z I1214 15:47:03.602893       1 tar.go:285] Adding to tar: /tmp/s2i-upload-done050185315 as s2i-upload-done050185315
2016-12-14T15:47:04.066532000Z I1214 15:47:04.065901       1 postexecutorstep.go:340] /bin/sh: /opt/jboss/scripts/assemble-runtime: Permission denied

seems like the permissions aren't getting set properly on the assemble-runtime script... investigating.

bparees · 2016-12-14T22:17:30Z

@php-coder it looks like the scripts in your test repo are not marked executable:
https://github.com/php-coder/java-maven-hello-world/tree/s2i-assemble-and-assemble-runtime/.s2i/bin

I guess this used to work, but would you expect it to work?

bparees · 2016-12-14T22:21:47Z

prereq PRs (I think):
openshift/test-maven-app#2
openshift/test-maven-app#1

php-coder · 2016-12-14T23:34:52Z

@bparees Thank you, Ben! It works before but now I don't know how :-/

bparees · 2016-12-15T00:07:07Z

I think our Tar logic may have been updating the permissions.

bparees · 2016-12-15T04:00:11Z

still failing :(

postexecutorstep.go:340] /bin/sh: /opt/jboss/scripts/assemble-runtime: Permission denied

I assume it has to do w/ this change in s2i:
openshift/source-to-image@c0eb0e3#diff-6b4b95c3fb2a650ac8b9a0c5eabdb8b3L129

And that we are now not going through the same chmod path.

jim-minter · 2016-12-15T17:42:59Z

My bad. I'm hoping that openshift/source-to-image#662 will fix this, but I'm still testing it here.

jim-minter · 2016-12-15T18:00:04Z

Confirmed, with this PR + openshift/source-to-image#662, the extended case 'should use assemble-runtime script from URL' now works for me.

@php-coder I don't mind either way but I would be tempted to revert openshift/test-maven-app#1 and openshift/test-maven-app#2, FWIW.

php-coder · 2016-12-15T18:11:34Z

@jim-minter You want to revert them just to make sure that your fix is working?

bparees · 2016-12-15T18:20:14Z

@php-coder shouldn't be necessary, since we're still broken right now (pending @jim-minter's changes), so we should already know if his changes fix it.

php-coder · 2016-12-15T18:25:34Z

@bparees Ok. Just in case I invited you and @jim-minter to be collaborators in this repo, so you will be able to do any changes that may be required. I don't want to block you.

bparees · 2016-12-15T18:26:23Z

@php-coder thanks!

…9bf1a1319e492e5

openshift-bot · 2016-12-16T18:05:47Z

Evaluated for origin testextended up to f99d782

bparees · 2016-12-16T19:28:36Z

flake #10663
[test]

openshift-bot · 2016-12-16T19:37:27Z

Evaluated for origin test up to f99d782

openshift-bot · 2016-12-16T20:53:23Z

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/12465/) (Base Commit: 7061e0b)

openshift-bot · 2016-12-16T21:45:27Z

continuous-integration/openshift-jenkins/testextended SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin_extended/924/) (Base Commit: 7061e0b) (Extended Tests: core(builds|image_ecosystem))

bparees · 2016-12-16T23:14:04Z

[merge] Ben Parees | OpenShift

…

On Dec 16, 2016 4:45 PM, "OpenShift Bot" ***@***.***> wrote: continuous-integration/openshift-jenkins/testextended SUCCESS ( https://ci.openshift.redhat.com/jenkins/job/test_pr_origin_extended/924/) (Base Commit: 7061e0b <7061e0b>) (Extended Tests: core(builds|image_ecosystem)) — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#12237 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AEvl3uww0HOOK2FKRQmBdFWdo5rDEGZsks5rIwZ9gaJpZM4LLKZM> .

bparees · 2016-12-17T02:47:31Z

flake #9886
[merge]

openshift-bot · 2016-12-17T02:53:20Z

Evaluated for origin merge up to f99d782

openshift-bot · 2016-12-17T03:37:26Z

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/12474/) (Base Commit: 48b0a74) (Image: devenv-rhel7_5563)

bparees force-pushed the s2i_bump branch from d891521 to 80b1548 Compare December 14, 2016 02:45

jim-minter suggested changes Dec 14, 2016

View reviewed changes

bparees force-pushed the s2i_bump branch from 80b1548 to 0d53bc2 Compare December 14, 2016 13:35

openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 15, 2016

bparees force-pushed the s2i_bump branch from 0d53bc2 to 1f40cb5 Compare December 15, 2016 18:22

openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 15, 2016

bparees added 2 commits December 16, 2016 13:01

bump(github.com/openshift/source-to-image): 3931979363ccb57da0c66c8aa…

f99d782

…9bf1a1319e492e5

s2i bump related code changes

8ce441a

bparees force-pushed the s2i_bump branch from 1f40cb5 to 8ce441a Compare December 16, 2016 18:02

openshift-bot merged commit 3b52b42 into openshift:master Dec 17, 2016

bparees deleted the s2i_bump branch December 21, 2016 21:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

s2i bump #12237

s2i bump #12237

bparees commented Dec 12, 2016 •

edited

Loading

bparees commented Dec 12, 2016

bparees commented Dec 12, 2016

bparees commented Dec 14, 2016

jim-minter Dec 14, 2016

bparees Dec 14, 2016

jim-minter Dec 14, 2016 •

edited

Loading

jim-minter Dec 14, 2016

jim-minter commented Dec 14, 2016

bparees commented Dec 14, 2016

bparees commented Dec 14, 2016

bparees commented Dec 14, 2016

bparees commented Dec 14, 2016

php-coder commented Dec 14, 2016

bparees commented Dec 15, 2016

bparees commented Dec 15, 2016 •

edited

Loading

jim-minter commented Dec 15, 2016

jim-minter commented Dec 15, 2016

php-coder commented Dec 15, 2016

bparees commented Dec 15, 2016

php-coder commented Dec 15, 2016 •

edited

Loading

bparees commented Dec 15, 2016

openshift-bot commented Dec 16, 2016

bparees commented Dec 16, 2016

openshift-bot commented Dec 16, 2016

openshift-bot commented Dec 16, 2016

openshift-bot commented Dec 16, 2016

bparees commented Dec 16, 2016 via email

bparees commented Dec 17, 2016

openshift-bot commented Dec 17, 2016

openshift-bot commented Dec 17, 2016 •

edited

Loading

s2i bump #12237

s2i bump #12237

Conversation

bparees commented Dec 12, 2016 • edited Loading

bparees commented Dec 12, 2016

bparees commented Dec 12, 2016

bparees commented Dec 14, 2016

jim-minter Dec 14, 2016

Choose a reason for hiding this comment

bparees Dec 14, 2016

Choose a reason for hiding this comment

jim-minter Dec 14, 2016 • edited Loading

Choose a reason for hiding this comment

jim-minter Dec 14, 2016

Choose a reason for hiding this comment

jim-minter commented Dec 14, 2016

bparees commented Dec 14, 2016

bparees commented Dec 14, 2016

bparees commented Dec 14, 2016

bparees commented Dec 14, 2016

php-coder commented Dec 14, 2016

bparees commented Dec 15, 2016

bparees commented Dec 15, 2016 • edited Loading

jim-minter commented Dec 15, 2016

jim-minter commented Dec 15, 2016

php-coder commented Dec 15, 2016

bparees commented Dec 15, 2016

php-coder commented Dec 15, 2016 • edited Loading

bparees commented Dec 15, 2016

openshift-bot commented Dec 16, 2016

bparees commented Dec 16, 2016

openshift-bot commented Dec 16, 2016

openshift-bot commented Dec 16, 2016

openshift-bot commented Dec 16, 2016

bparees commented Dec 16, 2016 via email

bparees commented Dec 17, 2016

openshift-bot commented Dec 17, 2016

openshift-bot commented Dec 17, 2016 • edited Loading

bparees commented Dec 12, 2016 •

edited

Loading

jim-minter Dec 14, 2016 •

edited

Loading

bparees commented Dec 15, 2016 •

edited

Loading

php-coder commented Dec 15, 2016 •

edited

Loading

openshift-bot commented Dec 17, 2016 •

edited

Loading