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

Backport of ci: fix runner calculation to exclude the top level directory as part of the calculation into release/1.15.x #17111

Merged
merged 4 commits into from
Apr 25, 2023

Conversation

hc-github-team-consul-core
Copy link
Contributor

Backport

This PR is auto-generated from #17090 to be assessed for backporting due to the inclusion of the label backport/1.15.

WARNING automatic cherry-pick of commits failed. Commits will require human attention.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


When calculating number of runners, find reports back the top level current directory in addition to the child directories. The actual splitting does not include this top level, so the process hangs. This fix excludes the top level.

Description

Testing & Reproduction steps

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/jm/num-runner/carefully-novel-eel branch from eef5e4a to 153114a Compare April 24, 2023 20:26
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/jm/num-runner/carefully-novel-eel branch from 153114a to eef5e4a Compare April 24, 2023 20:26
@github-actions github-actions bot added theme/contributing Additions and enhancements to community contributing materials type/ci Relating to continuous integration (CI) tooling for testing or releases labels Apr 24, 2023
Copy link

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@jmurret jmurret marked this pull request as ready for review April 24, 2023 20:50
@jmurret jmurret enabled auto-merge (squash) April 24, 2023 20:50
@jmurret jmurret force-pushed the backport/jm/num-runner/carefully-novel-eel branch from f418031 to 38bb381 Compare April 24, 2023 23:54
jmurret and others added 4 commits April 24, 2023 17:54
… of the calculation (#17090)

* fix runner calculation to exclude the top level directory as part of the calculation

* fix the logic for generating the directories/functions

* De-scope tenenacy requirements to OSS only for now. (#17087)

Partition and namespace must be "default"
Peername must be "local"

* Fix virtual services being included in intention topology as downstreams. (#17099)

* Merge pull request #5200 from hashicorp/NET-3758 (#17102)

* Merge pull request #5200 from hashicorp/NET-3758

NET-3758: connect: update supported envoy versions to 1.26.0

* lint

* CI: remove uneeded AWS creds from test-integrations (#17104)

* Update test-integrations.yml

* removing permission lies now that vault is not used in this job.

---------

Co-authored-by: John Murret <john.murret@hashicorp.com>

* update based on feedback

---------

Co-authored-by: Semir Patel <semir.patel@hashicorp.com>
Co-authored-by: Derek Menteer <105233703+hashi-derek@users.noreply.github.com>
Co-authored-by: Anita Akaeze <anita.akaeze@hashicorp.com>
Co-authored-by: Dan Bond <danbond@protonmail.com>
@jmurret jmurret merged commit acfd7d7 into release/1.15.x Apr 25, 2023
@jmurret jmurret deleted the backport/jm/num-runner/carefully-novel-eel branch April 25, 2023 00:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
theme/contributing Additions and enhancements to community contributing materials type/ci Relating to continuous integration (CI) tooling for testing or releases
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants