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

release(prod): 2021.11.11.0-1, ECC concurrency, initFile robustness, and pktfwd rewrite #215

Merged
merged 24 commits into from
Nov 15, 2021

Conversation

marvinmarnold
Copy link
Contributor

@marvinmarnold marvinmarnold commented Nov 12, 2021

Why
master and production have diverged. This will put them back in parity. Warning, because of the drift, this PR requires extra attention before merging.

How
Because the branches have diverged, master cannot be directly merged into production. This PR solves merge conflicts. It will need to be merged into production and back-merged into master. -1 also appended to FIRMWARE_VERSION to indicate that it is distinct Nebra release using the same Helium version.

References

shawaj and others added 23 commits October 23, 2021 22:24
test diag with new base image
bump upnp for testing
The packet forwarder actually requires the miner container to be able to accept connections on the hostname helium-miner before it will be able to start the concentrator.

This adds a depends_on to not attempt to start the packet forwarder container until the miner container is up
fix: add depends on for packet forwarder
Bumps UPnP, config, diag and packet forwarder containers so they are now all using the same base image.

We need to now test that it's actually smaller so will leave #182 open for now.
Bump to 2021.10.27.0_GA
Added documentation to the readme for quick start (#189)
Bump to 2021.10.29.0_GA
Bump to 2021.11.02.0_GA
rearrange readme
Bump diag and config
…1-10-0

release(testnet): GA 2021.11.10.0
…1-11-0

release(testnet): GA 2021.11.11.0
Lock ECC usage and ensure initFile always returns.
@marvinmarnold marvinmarnold requested a review from a team as a code owner November 12, 2021 20:34
docker-compose.yml Outdated Show resolved Hide resolved
depends_on:
- dbus-session
- diagnostics
environment:
- FIRMWARE_VERSION=2021.11.11.0
- FIRMWARE_VERSION=2021.11.11.0-1
Copy link
Member

Choose a reason for hiding this comment

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

I'd like to ensure that this non standard version number layout doesn't cause any issues with diagnostics and config

Don't see why it would, but just in case

Copy link
Contributor Author

Choose a reason for hiding this comment

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

What's the way we've done it in the past? 2021.11.11.0.1?

Copy link
Member

Choose a reason for hiding this comment

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

Would have been 2021.11.11.1

I think your way is the best. Just want to make sure it doesn't cause any issues with anything. Can't see why it would in particular was just a thought

Copy link
Contributor

Choose a reason for hiding this comment

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

We treat it as a string, so this really shouldn't cause any issues and it has passed QA.

Copy link
Member

Choose a reason for hiding this comment

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

@vpetersson we didn't QA it with this version number...

Copy link
Member

Choose a reason for hiding this comment

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

@KevinWassermann94 can you check some production devices to see that the version number hasn't caused any issues?

Copy link
Contributor

Choose a reason for hiding this comment

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

@shawaj Should be covered in the QC playbook already (correct me if i'm wrong @KevinWassermann94).

Copy link
Contributor

Choose a reason for hiding this comment

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

@shawaj I am waiting for the production to update.

@vpetersson We should add a term to the GA playbook that no further commits should be pushed to a PR without testing them on the testnet first

Copy link
Contributor

Choose a reason for hiding this comment

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

@KevinWassermann94 we can solve that by signing off a particular commit hash.

@marvinmarnold marvinmarnold changed the title release(prod): 2021.11.11.0-1, ECC and initFile robustness release(prod): 2021.11.11.0-1, ECC concurrency, initFile robustness, and pktfwd rewrite Nov 12, 2021
Including likely unnecessary patch to regions.
Copy link
Contributor

@KevinWassermann94 KevinWassermann94 left a comment

Choose a reason for hiding this comment

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

I am happy to sign this off, the only issue I am seeing on the testnet is NebraLtd/hm-pktfwd#67 which should not be a blocker.
This helps a significant amount of units

@vpetersson vpetersson merged commit 1db50e8 into production Nov 15, 2021
@shawaj shawaj deleted the marvinmarnold/prod/ecc-initFile-fixes branch November 15, 2021 15:30
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.

5 participants