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

Updating bucket references from O11y to Ingest path #454

Merged
merged 65 commits into from
Oct 2, 2024

Conversation

rowlandgeoff
Copy link
Contributor

@rowlandgeoff rowlandgeoff commented Sep 11, 2024

Updating bucket references from obs-ci-cache to ingest-buildkite-ci

Closes: https://github.com/elastic/ingest-dev/issues/3751

Copy link

mergify bot commented Sep 11, 2024

This pull request does not have a backport label. Could you fix it @rowlandgeoff? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d is the label to automatically backport to the 1./d branch. /d is the digit
    NOTE: backport-skip has been added to this pull request.

@rowlandgeoff
Copy link
Contributor Author

Hmm, all staging steps are failing with:

go: downloading golang.org/x/mod v0.16.0
--  | 🚨 Error: The command exited with status 1

@rowlandgeoff
Copy link
Contributor Author

I'm no golang dependency expert, but with several version bumps being dealt with in other open PRs, feels like this should wait until those are resolved.

@v1v v1v added backport-v1.22 Automated label to backport with Mergify and removed backport-skip labels Sep 18, 2024
@v1v
Copy link
Member

v1v commented Oct 1, 2024

I've just added the label for all the existing branches, so the same mechanism can be enabled in each branch even if they reached EOL, so we don't have any references to the former bucket.

@rowlandgeoff
Copy link
Contributor Author

Alright, guess I'll just use this messy PR with long list of commits rather than opening a fresh one. They're all going to get squashed anyway.

@rowlandgeoff rowlandgeoff marked this pull request as ready for review October 1, 2024 21:39
@rowlandgeoff rowlandgeoff requested review from a team and v1v October 1, 2024 21:39
v1v
v1v previously approved these changes Oct 2, 2024
Copy link
Member

@v1v v1v left a comment

Choose a reason for hiding this comment

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

LGTM with just a couple of minor nits

@@ -61,11 +59,11 @@ RUN mkdir -p /tmp/osxcross
# https://raw.githubusercontent.com/crazy-max/docker-osxcross/main/patches/lcxx.patch
COPY lcxx.patch /tmp/osxcross/lcxx.patch

COPY sdks/MacOSX10.11.sdk.tar.xz tarballs/${OSX_SDK}.tar.xz
Copy link
Member

Choose a reason for hiding this comment

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

Do you think 10.11 could be replaced with a similar arg ${SDK_VERSION}? However, it's not defined in the ARG section above, but it's already defined in go/darwin/Dockerfile.tmpl

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh good catch! It looks like through my copy/paste that I changed which SDK version was getting used here. Will fix.

Co-authored-by: Victor Martinez <[email protected]>
@elasticmachine
Copy link

💚 Build Succeeded

History

@elasticmachine
Copy link

💚 Build Succeeded

History

@elasticmachine
Copy link

💚 Build Succeeded

History

@rowlandgeoff rowlandgeoff merged commit 206cfe2 into main Oct 2, 2024
10 checks passed
@rowlandgeoff rowlandgeoff deleted the bucketPathUpdate branch October 2, 2024 16:10
mergify bot pushed a commit that referenced this pull request Oct 2, 2024
Co-authored-by: Victor Martinez <[email protected]>
(cherry picked from commit 206cfe2)

# Conflicts:
#	Makefile.common
#	README.md
#	go/Makefile.common
#	go/darwin/Dockerfile.tmpl
#	go/llvm-apple/Dockerfile.tmpl
#	go/main/Dockerfile.tmpl
mergify bot pushed a commit that referenced this pull request Oct 2, 2024
Co-authored-by: Victor Martinez <[email protected]>
(cherry picked from commit 206cfe2)
mergify bot pushed a commit that referenced this pull request Oct 2, 2024
Co-authored-by: Victor Martinez <[email protected]>
(cherry picked from commit 206cfe2)
mergify bot pushed a commit that referenced this pull request Oct 2, 2024
Co-authored-by: Victor Martinez <[email protected]>
(cherry picked from commit 206cfe2)
rowlandgeoff added a commit that referenced this pull request Oct 2, 2024
@rowlandgeoff
Copy link
Contributor Author

@v1v I see you closed the 1.16 backport, 1.17-1.19 don't seem to have backport PRs, and 1.20/1.21 are failing. Which versions do we need to support on this repo?

@v1v
Copy link
Member

v1v commented Oct 2, 2024

@v1v I see you closed the 1.16 backport, 1.17-1.19 don't seem to have backport PRs, and 1.20/1.21 are failing. Which versions do we need to support on this repo?

I saw 1.17-1.19 were not created but I didn't investigate the reason why mergify didn't create them.

I think old branches might be affected by #444 and those branches are already EOL.

For Golang, we only support the latest minor and previous minor, so 1.23 and 1.22 are the currently supported branches, and 1.23 is the one in main.

I initially wanted to replace the Google bucket reference in the old branches, but I think we have never needed to build an EOL branch.

Because backporting and fixing EOL branches is of little value, I think we are good with the current backports. We can close 1.20 and 1.21.

@v1v
Copy link
Member

v1v commented Oct 2, 2024

I see you closed the 1.16 backport

BTW, sorry If I was too enthusiastic and unclear about the rationale 🙇

@rowlandgeoff
Copy link
Contributor Author

Thanks very much. I closed 1.20 & 1.21. Appreciate the help. 🙇

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.

4 participants