[release-4.5] Bug 1843405: preserve ARG values that come before the first FROM #156

openshift-cherrypick-robot · 2020-06-03T09:02:30Z

This is an automated cherry-pick of #132

/assign adambkaplan

Some of the helper functions that addBuildParameters() calls modify the parsed tree, discarding ARG instructions that precede the first FROM instruction. The replacement Dockerfile that we generate from that tree would be missing those instructions. Knowing that this will happen, walk the parsed tree beforehand, recording ARG instructions that precede the first FROM instruction, and then re-prepend them to the Dockerfile that we generate from our tree after we've finished manipulating it. If we've got BuildArgs in a DockerStrategy, populate the BuildArgs map that we pass to imagebuilder functions that might have a use for them. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

We usually try to pull images that are referenced in the Dockerfile ourselves, so that we can record the time required to pull them. If we looked for the image and encounter a problem other than image-hasn't-been-pulled, we would previously have failed, but instead, we now let the build stage handle attempting to pull the image. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

openshift-ci-robot · 2020-06-03T09:02:47Z

@openshift-cherrypick-robot: Bugzilla bug 1842982 has been cloned as Bugzilla bug 1843405. Retitling PR to link against new bug.
/retitle [release-4.5] Bug 1843405: preserve ARG values that come before the first FROM

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-ci-robot · 2020-06-03T09:03:08Z

@openshift-cherrypick-robot: This pull request references Bugzilla bug 1843405, which is invalid:

expected dependent Bugzilla bug 1842982 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is MODIFIED instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

adambkaplan

/lgtm

openshift-ci-robot · 2020-06-04T15:28:12Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adambkaplan, openshift-cherrypick-robot

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:

~~OWNERS~~ [adambkaplan]

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

openshift-bot · 2020-06-04T19:48:10Z

/retest

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

openshift-bot · 2020-06-04T20:01:31Z

/retest

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

openshift-bot · 2020-06-05T01:01:08Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2020-06-05T01:01:11Z

@openshift-bot: This pull request references Bugzilla bug 1843405, which is invalid:

expected the bug to target the "4.5.0" release, but it targets "4.5.z" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-bot · 2020-06-06T01:00:54Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2020-06-06T01:00:56Z

@openshift-bot: This pull request references Bugzilla bug 1843405, which is invalid:

expected the bug to target the "4.5.0" release, but it targets "4.5.z" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-bot · 2020-06-07T01:00:43Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2020-06-07T01:00:46Z

@openshift-bot: This pull request references Bugzilla bug 1843405, which is invalid:

expected the bug to target the "4.5.0" release, but it targets "4.5.z" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-bot · 2020-06-08T01:00:49Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2020-06-08T01:00:51Z

@openshift-bot: This pull request references Bugzilla bug 1843405, which is invalid:

expected the bug to target the "4.5.0" release, but it targets "4.5.z" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-bot · 2020-06-09T01:00:59Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2020-06-09T01:01:02Z

@openshift-bot: This pull request references Bugzilla bug 1843405, which is invalid:

expected the bug to target the "4.5.0" release, but it targets "4.5.z" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-bot · 2020-06-10T01:00:31Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2020-06-10T01:00:34Z

@openshift-bot: This pull request references Bugzilla bug 1843405, which is invalid:

expected the bug to target the "4.5.0" release, but it targets "4.5.z" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-bot · 2020-06-11T01:01:02Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2020-06-14T01:00:51Z

@openshift-bot: This pull request references Bugzilla bug 1843405, which is invalid:

expected the bug to target the "4.5.0" release, but it targets "4.5.z" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-bot · 2020-06-15T01:00:45Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2020-06-15T01:00:47Z

@openshift-bot: This pull request references Bugzilla bug 1843405, which is invalid:

expected the bug to target the "4.5.0" release, but it targets "4.5.z" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-bot · 2020-06-16T01:01:19Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2020-06-16T01:01:23Z

@openshift-bot: This pull request references Bugzilla bug 1843405, which is invalid:

expected the bug to target the "4.5.0" release, but it targets "4.5.z" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-bot · 2020-06-17T01:01:03Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2020-06-17T01:01:06Z

@openshift-bot: This pull request references Bugzilla bug 1843405, which is invalid:

expected the bug to target the "4.5.0" release, but it targets "4.5.z" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-bot · 2020-06-18T01:00:38Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2020-06-18T01:00:41Z

@openshift-bot: This pull request references Bugzilla bug 1843405, which is invalid:

expected the bug to target the "4.5.0" release, but it targets "4.5.z" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-bot · 2020-06-19T01:00:49Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2020-06-19T01:00:51Z

@openshift-bot: This pull request references Bugzilla bug 1843405, which is invalid:

expected the bug to target the "4.5.0" release, but it targets "4.5.z" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-bot · 2020-06-20T01:08:49Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2020-06-20T01:08:51Z

@openshift-bot: This pull request references Bugzilla bug 1843405, which is invalid:

expected the bug to target the "4.5.0" release, but it targets "4.5.z" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-bot · 2020-06-21T01:01:09Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2020-06-21T01:01:12Z

@openshift-bot: This pull request references Bugzilla bug 1843405, which is invalid:

expected the bug to target the "4.5.0" release, but it targets "4.5.z" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-bot · 2020-06-22T01:01:09Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2020-06-22T01:01:11Z

@openshift-bot: This pull request references Bugzilla bug 1843405, which is invalid:

expected the bug to target the "4.5.0" release, but it targets "4.5.z" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-bot · 2020-06-23T01:01:16Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2020-06-23T01:01:18Z

@openshift-bot: This pull request references Bugzilla bug 1843405, which is invalid:

expected the bug to target the "4.5.0" release, but it targets "4.5.z" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-bot · 2020-06-24T01:01:32Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2020-06-24T01:01:34Z

@openshift-bot: This pull request references Bugzilla bug 1843405, which is invalid:

expected the bug to target the "4.5.0" release, but it targets "4.5.z" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

rhatdan · 2020-07-10T11:03:56Z

@adambkaplan This needs a bugzilla in order to be merged?

adambkaplan · 2020-07-15T14:20:15Z

@rhatdan it needs to be "valid-BZ" - we have a Bugzilla already, it can't merge until OCP 4.5 is GA.

sdodson · 2020-07-15T19:47:08Z

/bugzilla refresh

openshift-ci-robot · 2020-07-15T19:47:15Z

@sdodson: This pull request references Bugzilla bug 1843405, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.5.z) matches configured target release for branch (4.5.z)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 1842982 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
dependent Bugzilla bug 1842982 targets the "4.6.0" release, which is one of the valid target releases: 4.6.0, 4.6.z
bug has dependents

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-ci-robot · 2020-07-29T21:23:07Z

@openshift-cherrypick-robot: All pull requests linked via external trackers have merged: openshift/builder#156. Bugzilla bug 1843405 has been moved to the MODIFIED state.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

nalind added 2 commits June 3, 2020 09:02

openshift-ci-robot assigned adambkaplan Jun 3, 2020

openshift-cherrypick-robot mentioned this pull request Jun 3, 2020

Bug 1842982: preserve ARG values that come before the first FROM #132

Merged

openshift-ci-robot requested review from coreydaley and gabemontero June 3, 2020 09:02

openshift-ci-robot changed the title ~~[release-4.5] Bug 1842982: preserve ARG values that come before the first FROM~~ [release-4.5] Bug 1843405: preserve ARG values that come before the first FROM Jun 3, 2020

openshift-ci-robot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Jun 3, 2020

adambkaplan approved these changes Jun 4, 2020

View reviewed changes

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 4, 2020

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 4, 2020

openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Jul 15, 2020

sdodson added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jul 29, 2020

openshift-merge-robot merged commit 554806f into openshift:release-4.5 Jul 29, 2020

[release-4.5] Bug 1843405: preserve ARG values that come before the first FROM #156

[release-4.5] Bug 1843405: preserve ARG values that come before the first FROM #156

Conversation

openshift-cherrypick-robot commented Jun 3, 2020

openshift-ci-robot commented Jun 3, 2020

openshift-ci-robot commented Jun 3, 2020

adambkaplan left a comment

Choose a reason for hiding this comment

openshift-ci-robot commented Jun 4, 2020

openshift-bot commented Jun 4, 2020

openshift-bot commented Jun 4, 2020

openshift-bot commented Jun 5, 2020

openshift-ci-robot commented Jun 5, 2020

openshift-bot commented Jun 6, 2020

openshift-ci-robot commented Jun 6, 2020

openshift-bot commented Jun 7, 2020

openshift-ci-robot commented Jun 7, 2020

openshift-bot commented Jun 8, 2020

openshift-ci-robot commented Jun 8, 2020

openshift-bot commented Jun 9, 2020

openshift-ci-robot commented Jun 9, 2020

openshift-bot commented Jun 10, 2020

openshift-ci-robot commented Jun 10, 2020

openshift-bot commented Jun 11, 2020

openshift-ci-robot commented Jun 14, 2020

openshift-bot commented Jun 15, 2020

openshift-ci-robot commented Jun 15, 2020

openshift-bot commented Jun 16, 2020

openshift-ci-robot commented Jun 16, 2020

openshift-bot commented Jun 17, 2020

openshift-ci-robot commented Jun 17, 2020

openshift-bot commented Jun 18, 2020

openshift-ci-robot commented Jun 18, 2020

openshift-bot commented Jun 19, 2020

openshift-ci-robot commented Jun 19, 2020

openshift-bot commented Jun 20, 2020

openshift-ci-robot commented Jun 20, 2020

openshift-bot commented Jun 21, 2020

openshift-ci-robot commented Jun 21, 2020

openshift-bot commented Jun 22, 2020

openshift-ci-robot commented Jun 22, 2020

openshift-bot commented Jun 23, 2020

openshift-ci-robot commented Jun 23, 2020

openshift-bot commented Jun 24, 2020

openshift-ci-robot commented Jun 24, 2020

rhatdan commented Jul 10, 2020

adambkaplan commented Jul 15, 2020

sdodson commented Jul 15, 2020

openshift-ci-robot commented Jul 15, 2020

openshift-ci-robot commented Jul 29, 2020