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 tag as the release branch in jenkinsfile release #640

Merged
merged 1 commit into from
Sep 12, 2024

Conversation

peterzhuamazon
Copy link
Member

@peterzhuamazon peterzhuamazon commented Sep 12, 2024

Description

Add tag as the release branch in jenkinsfile release

Issues Resolved

Closes #641

Testing

  • New functionality includes testing

[Describe how this change was tested]


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
'cp -a opensearch-benchmark/* ./"',
'cd docker/ci',
"su $(id -un 1000) -c \"cd docker/ci",
"git clone https://github.com/opensearch-project/opensearch-benchmark --branch ${tag} --single-branch opensearch-benchmark",
Copy link
Collaborator

Choose a reason for hiding this comment

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

Our tags are with V.V.V format but our branches use V.V (do not have the patch version). Will this work with the current branch structure still?

Copy link
Member Author

@peterzhuamazon peterzhuamazon Sep 12, 2024

Choose a reason for hiding this comment

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

$tag is just a var holding $ref: https://github.com/opensearch-project/opensearch-build-libraries/blob/main/vars/standardReleasePipelineWithGenericTrigger.groovy#L58C13-L58C16

$ref is holding the actual tag name: https://github.com/opensearch-project/opensearch-build-libraries/blob/main/vars/standardReleasePipelineWithGenericTrigger.groovy#L42

And --branch accept branch name and tag name as so on despite the param name is --branch. It just pull the HEAD based on the branch or tag you provide:
https://git-scm.com/docs/git-clone#Documentation/git-clone.txt-code--branchcodeemltnamegtem

We should be good with this change.


$ git clone https://github.com/opensearch-project/opensearch-benchmark --branch 1.9.0 --single-branch opensearch-benchmark
Cloning into 'opensearch-benchmark'...
remote: Enumerating objects: 17252, done.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Sounds good. Thanks for clarifying.

Copy link
Collaborator

@IanHoang IanHoang left a comment

Choose a reason for hiding this comment

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

LGTM

'cp -a opensearch-benchmark/* ./"',
'cd docker/ci',
"su $(id -un 1000) -c \"cd docker/ci",
"git clone https://github.com/opensearch-project/opensearch-benchmark --branch ${tag} --single-branch opensearch-benchmark",
Copy link
Collaborator

Choose a reason for hiding this comment

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

Sounds good. Thanks for clarifying.

@IanHoang IanHoang merged commit cc1f62b into opensearch-project:main Sep 12, 2024
14 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 12, 2024
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit cc1f62b)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@peterzhuamazon peterzhuamazon deleted the release_by_tag branch September 12, 2024 21:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

Update to release from feature branches rather than main
3 participants