Skip to content

Yoga zed merge #607

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

Closed
wants to merge 53 commits into from
Closed

Yoga zed merge #607

wants to merge 53 commits into from

Conversation

Alex-Welsh
Copy link
Member

@Alex-Welsh Alex-Welsh commented Aug 31, 2023

Syncing latest stackhpc/yoga into Zed. Only real conflicts were in pulp.yml where formatting was changed to reduce repetition.

@Alex-Welsh Alex-Welsh requested a review from a team as a code owner August 31, 2023 12:50
@Alex-Welsh Alex-Welsh force-pushed the yoga-zed-merge branch 3 times, most recently from eedfc4f to 2d8b504 Compare August 31, 2023 14:15
@markgoddard
Copy link
Contributor

Weird pep8 reno failure

@Alex-Welsh
Copy link
Member Author

Alex-Welsh commented Sep 4, 2023

Weird pep8 reno failure

Spent a while looking at that last week. I think the issue is the git tagging is all off.
Unfortunately I based the stackhpc/zed branch on stackhpc/yoga, rather than upstream stable/zed. The automatic tagging from naming-things-is-hard therefore finds a common ancestor way back in yoga, and gets the tags wrong.
I think the fix is to:

  1. branch stable/zed (tmp/zed)
  2. merge in stackhpc/zed
  3. delete stackhpc/zed
  4. Rename tmp/zed ->stackhpc/zed

But that would need your magical admin powers.

I tried a few different merge/rebase style solutions but nothing quite kept all the changes properly. There might be a way but my git wrangling skills don't quite stretch that far

markgoddard
markgoddard previously approved these changes Sep 4, 2023
jackhodgkiss and others added 21 commits September 4, 2023 12:21
Designate along with Redis have both been enabled to provide
the multinode environment with DNSaaS.

Designate has been configured to permit forwarding of queries to
either GoogleDNS or CloudflareDNS.
This change adds a template secrets.yml file to provide a definition
for the barbican role IDs required for backend and internal TLS.
Use Tenks to provide virtual bare metal, with Kayobe helper scripts to
deploy.
Needs installing in the Seed Node virtualenv.
Some dependencies for generating backend API certificates were missing
but were undetected because they were fulfilled by other vault playbooks
run earlier during the deployment process.

This was detected when playbook hosts were extended to include separate
network hosts running some OpenStack services.
assumptionsandg and others added 19 commits September 4, 2023 13:27
* Add Ubuntu Jammy repository config

* Updated docs for jammy config

* Docker and UCA repository corrections

* Consolidating repository config in pulp.yml

* Release note for changes
Running Pulp with a number of workers based on CPUs can cause errors
such as PostgreSQL connection limits on hosts with many cores:

    psycopg.OperationalError: connection failed: FATAL:  remaining connection slots are reserved for non-replication superuser connections

Cap workers to 32 until large scale testing can identify a more suitable
limit.
The default Python version has changed from 3.7 to 3.11 when updating
Read the Docs configuration. See the announcement of configuration file
version 2 for more details [1].

[1] https://blog.readthedocs.com/migrate-configuration-v2/
Read the Docs does not perform a full clone on checkout job to reduce
network data and speed up the build process. Because of this, extensions
that depend on the full Git history will fail [1].

This breaks build of release notes, since reno needs Git history access.

[1] https://docs.readthedocs.io/en/stable/build-customization.html#unshallow-git-clone
The Git shallow clone used on Read the Docs is configured to only fetch
a specific Git branch:

[remote "origin"]
	url = https://github.com/stackhpc/stackhpc-kayobe-config.git
	fetch = +refs/heads/stackhpc/yoga:refs/remotes/origin/stackhpc/yoga

This prevents subsequent `git fetch` commands from fetching all remote
branches. Use `git remote set-branches origin '*'` to revert to the
default Git fetch configuration.
The wildcard glob matched files in the current directory which resulted
in `git fetch` failing with:

    fatal: couldn't find remote ref refs/heads/LICENSE
Use an explicit list of remote branches with release notes instead of a
wildcard which is behaving differently on Read the Docs than locally.

Also remove true fallback to fail early.
Uses the same os_release template as the ci-multinode environment.
It prevents NetworkManager from automatically running DHCP on
unconfigured ethernet devices and allows connections with static IP
addresses to be brought up even on ethernet devices with no carrier.
Bumped focal repos to fix unmet dependencies on container build.
Built new Magnum containers including fix for missing Octavia
load balancer health monitors.
Fixes bug 2015393 - missing Octavia health monitors on cluster spawn.
This requires stackhpc.cephadm 1.14.0.
Image builds were previously failing due to the runners being
provisioned with CS8 (Zed requires python > 3.6 which CS8 does not
support). This change edits the workflow to use new RL9 images, which
can build Zed container images.

The workflow also had some CS8-specific customisations which have been
removed
@Alex-Welsh
Copy link
Member Author

Closing in favour of #620 due to my mistake rebasing this branch on stackhpc/zed

@Alex-Welsh Alex-Welsh closed this Sep 6, 2023
@Alex-Welsh Alex-Welsh deleted the yoga-zed-merge branch November 22, 2024 16:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.