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

Migrate needed .ci/* scripts into .buildkite/* ( elastic#3353 ) #39661

Merged
merged 3 commits into from
May 28, 2024

Conversation

ev1yehor
Copy link
Contributor

@ev1yehor ev1yehor commented May 22, 2024

Proposed commit message

Migrate needed .ci/* scripts into .buildkite/* and change path for them.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Logs

@ev1yehor ev1yehor self-assigned this May 22, 2024
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 22, 2024
Copy link
Contributor

mergify bot commented May 22, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @ev1yehor? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label May 22, 2024
@ev1yehor ev1yehor added backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.13.0 Automated backport with mergify backport-v8.14.0 Automated backport with mergify ci labels May 22, 2024
Copy link
Contributor

@dliappis dliappis 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!

A couple of suggestions:

  1. Let's wait that https://github.com/elastic/beats/pull/39648/files get's merged because it changes the version of localstack in the docker-compose file

  2. Let's run the entire testing suite by adding all the optional GH labels aws, :Windows, macOS to ensure nothing breaks with this.

@ev1yehor ev1yehor added :Windows macOS Enable builds in the CI for darwin testing aws Enable builds in the CI for aws cloud testing labels May 23, 2024
@dliappis
Copy link
Contributor

@ev1yehor fyi, after adding labels (thanks for doing that!) we need to manually retrigger tests by leaving a comment like #39392 (comment) -- trigger phrase can be found in

"trigger_comment_regex": "^/(?:test)",
"always_trigger_comment_regex": "^/(?:test)",
) . They won't be automatically retriggered just by changing labels. Another way to retrigger is to click "Update branch", this will also retrigger the test.

@ev1yehor
Copy link
Contributor Author

/test

Copy link
Contributor

mergify bot commented May 27, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b Migrate-files-issue-3353 upstream/Migrate-files-issue-3353
git merge upstream/main
git push upstream Migrate-files-issue-3353

@ev1yehor
Copy link
Contributor Author

/test

1 similar comment
@ev1yehor
Copy link
Contributor Author

/test

Copy link
Contributor

@oakrizan oakrizan left a comment

Choose a reason for hiding this comment

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

There is no docker-compose.yml on 7.17. I believe that file shouldn't be backported there. WDYT @dliappis?

@dliappis
Copy link
Contributor

There is no docker-compose.yml on 7.17. I believe that file shouldn't be backported there. WDYT @dliappis?

Indeed, thanks for catching. However, we still have references to the non-existing .ci/jobs/docker-compose file right now in the 7.17 branch in .buildkite/scripts/common.sh and .buildkite/scrpts/setup_cloud_env.sh so I'd say that specifically in the 7.17 backport of this we could do the needed clean ups and checks.

@dliappis dliappis self-requested a review May 28, 2024 08:17
Copy link
Contributor

@dliappis dliappis left a comment

Choose a reason for hiding this comment

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

@ev1yehor ev1yehor marked this pull request as ready for review May 28, 2024 10:22
@ev1yehor ev1yehor requested a review from a team as a code owner May 28, 2024 10:22
@ev1yehor ev1yehor requested a review from a team as a code owner May 28, 2024 10:22
@ev1yehor ev1yehor requested review from AndersonQ and rdner May 28, 2024 10:22
@ev1yehor ev1yehor merged commit f411b06 into elastic:main May 28, 2024
163 checks passed
mergify bot pushed a commit that referenced this pull request May 28, 2024
* Migrate files and change path to them

* Delete files that was migrated to new path

(cherry picked from commit f411b06)

# Conflicts:
#	.buildkite/deploy/docker/docker-compose.yml
mergify bot pushed a commit that referenced this pull request May 28, 2024
* Migrate files and change path to them

* Delete files that was migrated to new path

(cherry picked from commit f411b06)
mergify bot pushed a commit that referenced this pull request May 28, 2024
* Migrate files and change path to them

* Delete files that was migrated to new path

(cherry picked from commit f411b06)
@ev1yehor ev1yehor added backport-7.17 Automated backport to the 7.17 branch with mergify and removed backport-7.17 Automated backport to the 7.17 branch with mergify labels May 29, 2024
ev1yehor added a commit that referenced this pull request Jun 5, 2024
…) (#39750)

* Migrate files and change path to them

* Delete files that was migrated to new path

(cherry picked from commit f411b06)

Co-authored-by: ev1yehor <[email protected]>
ev1yehor added a commit that referenced this pull request Jun 11, 2024
…) (#39748)

* Migrate files and change path to them

* Delete files that was migrated to new path

(cherry picked from commit f411b06)

# Conflicts:
#	.buildkite/deploy/docker/docker-compose.yml

Co-authored-by: ev1yehor <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
aws Enable builds in the CI for aws cloud testing backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.13.0 Automated backport with mergify backport-v8.14.0 Automated backport with mergify ci macOS Enable builds in the CI for darwin testing Team:Ingest-EngProd :Windows
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants