Skip to content

Make it easier to extract content from hack/env #10458

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

Merged
openshift-bot merged 1 commit into from
Aug 18, 2016
Merged

Make it easier to extract content from hack/env #10458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: go

go:
- 1.6
- tip
- 1.7
Copy link
Copy Markdown
Contributor

@stevekuznetsov stevekuznetsov Aug 16, 2016

Choose a reason for hiding this comment

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

I thought you argued to keep tip?

Copy link
Copy Markdown
Contributor Author

@smarterclayton smarterclayton Aug 16, 2016

Choose a reason for hiding this comment

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

Basically tip gets unstable after a release - probably half way through 1.8
we'll turn tip on. Otherwise would be failing all the time.

On Tue, Aug 16, 2016 at 12:41 PM, Steve Kuznetsov notifications@github.com
wrote:

In .travis.yml
#10458 (comment):

@@ -2,7 +2,7 @@ language: go

go:

  • 1.6
      • tip
      • 1.7

I thought you argued to keep tip?

—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
https://github.com/openshift/origin/pull/10458/files/4b046250753fe0e53bf15c100edb397d81ac6315#r74972318,
or mute the thread
https://github.com/notifications/unsubscribe-auth/ABG_pwAOcjhcjIDk_08kGQixr2ueJzNVks5qgehHgaJpZM4Jlmyi
.

Copy link
Copy Markdown
Contributor Author

@smarterclayton smarterclayton Aug 16, 2016

Choose a reason for hiding this comment

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

Like it is now

Copy link
Copy Markdown
Contributor

@liggitt liggitt Aug 17, 2016 •
edited by stevekuznetsov
Loading

Choose a reason for hiding this comment

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

you could always do

go:
  - 1.6
  - 1.7
  - tip

matrix:
  fast_finish: true
  allow_failures:
  - go: tip

and just toggle off allowing failures on tip mid-release

keeps travis green, lets you see tip status easily (see #10472 / https://travis-ci.org/openshift/origin/builds/152847351)

Copy link
Copy Markdown
Contributor Author

@smarterclayton smarterclayton Aug 17, 2016

Choose a reason for hiding this comment

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

I think tip is going to be bad for a while, and we don't care about tip much yet.

Copy link
Copy Markdown
Contributor

@liggitt liggitt Aug 17, 2016

Choose a reason for hiding this comment

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

okeydoke

Copy link
Copy Markdown
Contributor

@stevekuznetsov stevekuznetsov Aug 17, 2016

Choose a reason for hiding this comment

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

I feel like Jordan's approach is probably better so that people who care can look at the errors on tip and file upstream bugs as necessary, helps us all be part of a good open source community and all that jazz

Copy link
Copy Markdown
Contributor Author

@smarterclayton smarterclayton Aug 17, 2016 via email

Choose a reason for hiding this comment

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


install:
- export PATH=$GOPATH/bin:./_output/tools/etcd/bin:$PATH
Expand Down
4 changes: 1 addition & 3 deletions hack/build-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ trap "os::build::environment::cleanup ${container}" EXIT
os::build::get_version_vars
echo "++ Building release ${OS_GIT_VERSION}"
)
os::build::environment::withsource "${container}" "${OS_GIT_COMMIT:-HEAD}"
# Get the command output
docker cp "${container}:/go/src/github.com/openshift/origin/_output/local/releases" "${OS_OUTPUT}"
OS_BUILD_ENV_PRESERVE=_output/local/releases os::build::environment::withsource "${container}" "${OS_GIT_COMMIT:-HEAD}"
echo "${OS_GIT_COMMIT}" > "${OS_LOCAL_RELEASEPATH}/.commit"

ret=$?; ENDTIME=$(date +%s); echo "$0 took $(($ENDTIME - $STARTTIME)) seconds"; exit "$ret"
15 changes: 15 additions & 0 deletions hack/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,6 +1066,21 @@ function os::build::environment::withsource() {

docker start "${container}" > /dev/null
docker logs -f "${container}"

# extract content from the image
if [[ -n "${OS_BUILD_ENV_PRESERVE-}" ]]; then
local workingdir
workingdir="$(docker inspect -f '{{ index . "Config" "WorkingDir" }}' "${container}")"
local oldIFS="${IFS}"
IFS=:
for path in ${OS_BUILD_ENV_PRESERVE}; do
local parent
parent="$( dirname ${path} )"
mkdir -p "${parent}"
docker cp "${container}:${workingdir}/${path}" "${parent}"
done
IFS="${oldIFS}"
fi
}
readonly -f os::build::environment::withsource

Expand Down