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

Add explicit ARG ARO_VERSION to RP build stage in ci-rp #3597

Merged
merged 1 commit into from
Jun 4, 2024

Conversation

tsatam
Copy link
Collaborator

@tsatam tsatam commented May 28, 2024

Which issue this PR addresses:

Fixes no Jira

What this PR does / why we need it:

The go-toolset image used to build the ARO binary in make ci-rp sets its own VERSION environment variable, overriding the VERSION arg we pass in. This results in the version.GitCommit ldflag being set to an incorrect value (version of Go in the go-toolset image).

This PR changes the name of this argument to ARO_VERSION to avoid this naming conflict, and additionally explicitly sets this arg on the RP build stage, since all ARGs are set to nil at the completion of each stage in a multi-stage build.

Test plan for issue:

  • Ran make ci-rp with this change in place, and ensured the resulting binary has the correct ldflags set for version.GitCommit.

Is there any documentation that needs to be updated for this PR?

No

How do you know this will function as expected in production?

N/A (output of make ci-rp not yet used in production)

Copy link
Collaborator

@anshulvermapatel anshulvermapatel left a comment

Choose a reason for hiding this comment

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

Good catch. LGTM

Copy link
Collaborator

@shubhadapaithankar shubhadapaithankar left a comment

Choose a reason for hiding this comment

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

Looks good to me

@SudoBrendan
Copy link
Collaborator

/azp run ci

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@anshulvermapatel anshulvermapatel merged commit 019b6eb into master Jun 4, 2024
18 checks passed
@tsatam tsatam deleted the tsatam/hotfix-ci-rp-fix-version branch June 6, 2024 13:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants