OCPBUGS-25346: Generate both oc-mirror binaries for rhel9 and rhel8

[sherine-k]

Description

This PR cherry-picks the dockerfile changes in order to generate both rhel9 and rhel8 binaries, and adapts them to 4.15 context.

Fixes # OCPBUGS-25346

Type of change

Please delete options that are not relevant.

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)
• This change requires a documentation update

How Has This Been Tested?

Through prow build and automated tests.

Expected Outcome

The docker image generated by the ci should contain 2 binaries: oc-mirror.rhel8 and oc-mirror.rhel9

From the logs of the ci job images, build02 cluster was used.
Login to that cluster ( see instructions
then

oc registry login  
 skopeo copy docker://registry.build02.ci.openshift.org/ci-op-zcqrt91z/pipeline:oc-mirror oci:///home/skhoury/rel415_mirror
Getting image source signatures
Copying blob 397bffd2f247 done   | 
Copying blob ca1636478fe5 done   | 
Copying blob d1c21e1bfa89 done   | 
Copying blob 13c9a347b47c done   | 
Copying blob 8c9a579830bc done   | 
Copying config cb664ca284 done   | 
Writing manifest to image destination
╭─╼skhoury@fedora ~ 
╰─ -$ cd rel415_mirror/blobs/sha256/
╭─╼skhoury@fedora ~/.../blobs/sha256 
╰─ -$ for i in `ls `
> do 
> echo $i
> tar tvf $i | grep oc-mirror
> echo ----
> done
13c9a347b47c4b1b110976860d7000e2e90960634bea697084bb29eedfad9723
----
3112543dd7e4af7e3c14651164c3dc0d939ed1177bbfbb38f3e35bcdb649443c
tar: This does not look like a tar archive
tar: Skipping to next header
tar: Exiting with failure status due to previous errors
----
397bffd2f247532b177d8fc47d3c51573355d2b84e3f6c11ee1e21cbe3472553
-rwxr-xr-x 0/0       157317408 2024-02-29 16:33 usr/bin/oc-mirror
-rwxr-xr-x 0/0       157049624 2024-02-29 16:30 usr/bin/oc-mirror.rhel8
-rwxr-xr-x 0/0       157317408 2024-02-29 16:33 usr/bin/oc-mirror.rhel9
----

[openshift-ci-robot]

@sherine-k: This pull request references Jira Issue OCPBUGS-25346, which is invalid:

• expected the bug to be open, but it isn't
• expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Closed (Done-Errata) instead
• expected dependent Jira Issue OCPBUGS-23550 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is New instead

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

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Description

This PR cherry-picks the dockerfile changes in order to generate both rhel9 and rhel8 binaries, and adapts them to 4.15 context.

Fixes # OCPBUGS-25346

Type of change

Please delete options that are not relevant.

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)
• This change requires a documentation update

How Has This Been Tested?

Through prow build and automated tests.

Expected Outcome

The docker image generated by the ci should contain 2 binaries: oc-mirror.rhel8 and oc-mirror.rhel9

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 openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sherine-k

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 [sherine-k]

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

[openshift-ci]

@sherine-k: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

[sherine-k]

cc @zhouying7780 for validation
cc @lmzuccarelli + @aguidirh for reviews in my absence

[zhouying7780]

/label qe-approved

[openshift-ci-robot]

@sherine-k: This pull request references Jira Issue OCPBUGS-25346, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.15.z) matches configured target version for branch (4.15.z)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
• dependent bug Jira Issue OCPBUGS-23550 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-23550 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
• bug has dependents

Requesting review from QA contact:
/cc @zhouying7780

In response to this:

Description

This PR cherry-picks the dockerfile changes in order to generate both rhel9 and rhel8 binaries, and adapts them to 4.15 context.

Fixes # OCPBUGS-25346

Type of change

Please delete options that are not relevant.

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)
• This change requires a documentation update

How Has This Been Tested?

Through prow build and automated tests.

Expected Outcome

The docker image generated by the ci should contain 2 binaries: oc-mirror.rhel8 and oc-mirror.rhel9

From the logs of the ci job images, build02 cluster was used.
Login to that cluster ( see instructions
then

oc registry login  
skopeo copy docker://registry.build02.ci.openshift.org/ci-op-zcqrt91z/pipeline:oc-mirror oci:///home/skhoury/rel415_mirror
Getting image source signatures
Copying blob 397bffd2f247 done   | 
Copying blob ca1636478fe5 done   | 
Copying blob d1c21e1bfa89 done   | 
Copying blob 13c9a347b47c done   | 
Copying blob 8c9a579830bc done   | 
Copying config cb664ca284 done   | 
Writing manifest to image destination
╭─╼skhoury@fedora ~ 
╰─ -$ cd rel415_mirror/blobs/sha256/
╭─╼skhoury@fedora ~/.../blobs/sha256 
╰─ -$ for i in `ls `
> do 
> echo $i
> tar tvf $i | grep oc-mirror
> echo ----
> done
13c9a347b47c4b1b110976860d7000e2e90960634bea697084bb29eedfad9723
----
3112543dd7e4af7e3c14651164c3dc0d939ed1177bbfbb38f3e35bcdb649443c
tar: This does not look like a tar archive
tar: Skipping to next header
tar: Exiting with failure status due to previous errors
----
397bffd2f247532b177d8fc47d3c51573355d2b84e3f6c11ee1e21cbe3472553
-rwxr-xr-x 0/0       157317408 2024-02-29 16:33 usr/bin/oc-mirror
-rwxr-xr-x 0/0       157049624 2024-02-29 16:30 usr/bin/oc-mirror.rhel8
-rwxr-xr-x 0/0       157317408 2024-02-29 16:33 usr/bin/oc-mirror.rhel9
----

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 openshift-eng/jira-lifecycle-plugin repository.

[lmzuccarelli]

/label backport-risk-assessed

[zhouying7780]

/label cherry-pick-approved

[zhouying7780]

/label cherry-pick-approved

[lmzuccarelli]

/lgtm

[openshift-ci-robot]

@sherine-k: Jira Issue OCPBUGS-25346: All pull requests linked via external trackers have merged:

• openshift/oc-mirror#764
• openshift/oc-mirror#804

Jira Issue OCPBUGS-25346 has been moved to the MODIFIED state.

In response to this:

Description

This PR cherry-picks the dockerfile changes in order to generate both rhel9 and rhel8 binaries, and adapts them to 4.15 context.

Fixes # OCPBUGS-25346

Type of change

Please delete options that are not relevant.

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)
• This change requires a documentation update

How Has This Been Tested?

Through prow build and automated tests.

Expected Outcome

The docker image generated by the ci should contain 2 binaries: oc-mirror.rhel8 and oc-mirror.rhel9

From the logs of the ci job images, build02 cluster was used.
Login to that cluster ( see instructions
then

oc registry login  
skopeo copy docker://registry.build02.ci.openshift.org/ci-op-zcqrt91z/pipeline:oc-mirror oci:///home/skhoury/rel415_mirror
Getting image source signatures
Copying blob 397bffd2f247 done   | 
Copying blob ca1636478fe5 done   | 
Copying blob d1c21e1bfa89 done   | 
Copying blob 13c9a347b47c done   | 
Copying blob 8c9a579830bc done   | 
Copying config cb664ca284 done   | 
Writing manifest to image destination
╭─╼skhoury@fedora ~ 
╰─ -$ cd rel415_mirror/blobs/sha256/
╭─╼skhoury@fedora ~/.../blobs/sha256 
╰─ -$ for i in `ls `
> do 
> echo $i
> tar tvf $i | grep oc-mirror
> echo ----
> done
13c9a347b47c4b1b110976860d7000e2e90960634bea697084bb29eedfad9723
----
3112543dd7e4af7e3c14651164c3dc0d939ed1177bbfbb38f3e35bcdb649443c
tar: This does not look like a tar archive
tar: Skipping to next header
tar: Exiting with failure status due to previous errors
----
397bffd2f247532b177d8fc47d3c51573355d2b84e3f6c11ee1e21cbe3472553
-rwxr-xr-x 0/0       157317408 2024-02-29 16:33 usr/bin/oc-mirror
-rwxr-xr-x 0/0       157049624 2024-02-29 16:30 usr/bin/oc-mirror.rhel8
-rwxr-xr-x 0/0       157317408 2024-02-29 16:33 usr/bin/oc-mirror.rhel9
----

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 openshift-eng/jira-lifecycle-plugin repository.