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

e2e: add emojivoto to release #358

Merged
merged 3 commits into from
Apr 23, 2024
Merged

e2e: add emojivoto to release #358

merged 3 commits into from
Apr 23, 2024

Conversation

wirungu
Copy link
Contributor

@wirungu wirungu commented Apr 22, 2024

resourcegen now takes an additional argument for the file path containing image patches. The demo generation has been modified to make use of this, though the namespace patching still runs through kypatch for now.

@wirungu wirungu added the no changelog PRs not listed in the release notes label Apr 22, 2024
@wirungu wirungu requested a review from burgerdev April 22, 2024 04:09
@wirungu wirungu requested a review from katexochen as a code owner April 22, 2024 04:09
e2e/internal/kuberesource/resourcegen/main.go Outdated Show resolved Hide resolved
justfile Outdated
@@ -197,15 +197,11 @@ fmt:
lint:
nix run .#scripts.golangci-lint -- run

demodir namespace="default": coordinator initializer
Copy link
Contributor

Choose a reason for hiding this comment

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

Why are these not needed anymore?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The coordinator gets generated separately. Only the Emojivoto files need to be in the ZIP

Copy link
Contributor

Choose a reason for hiding this comment

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

Point taken about the coordinator, but what about the initializer? It needs to be patched in the demo resources, doesn't it?

@katexochen: demodir is currently a mix between released artifacts and HEAD. What do you think about moving back to "everything from HEAD" when releases include the demo app?

Copy link
Member

Choose a reason for hiding this comment

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

Why move to HEAD instead of taking everything from the release? The purpose of demodir is to drop a dev into a reliable and stable demo environment.

Copy link
Contributor

Choose a reason for hiding this comment

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

This will be possible with gh release download after the next release, which is why I was thinking to either drop the target (if we only ever want stable demo dirs), or use the dev build to simulate "what we would get if we'd cut a release now".

@wirungu
Copy link
Contributor Author

wirungu commented Apr 22, 2024

I'm also unsure how to complete the release workflow: should steps for installing and calling just be added to .github/workflows/release.yml or should I essentially replicate the nix shell commands from the justfile there?

@burgerdev
Copy link
Contributor

The nix run resourcegen line should go into a step here, followed by zipping it.

nix run .#scripts.write-coordinator-yaml -- "${coordinatorImgTagged}" > workspace/coordinator.yml

The resulting zip needs to be included into the released files.

files: |
result-cli/bin/contrast
workspace/coordinator.yml

There may be a general misunderstanding here: the demodir target is not supposed to be the basis for release, rather it was a convenient way to obtain both the released artifacts and the demo app with a simple command. As mentioned in the thread, I think demodir in its current form is obsolete when we release emojivoto.

@wirungu wirungu marked this pull request as draft April 22, 2024 08:54
@wirungu
Copy link
Contributor Author

wirungu commented Apr 22, 2024

The nix run resourcegen line should go into a step here, followed by zipping it.

nix run .#scripts.write-coordinator-yaml -- "${coordinatorImgTagged}" > workspace/coordinator.yml

The resulting zip needs to be included into the released files.

files: |
result-cli/bin/contrast
workspace/coordinator.yml

There may be a general misunderstanding here: the demodir target is not supposed to be the basis for release, rather it was a convenient way to obtain both the released artifacts and the demo app with a simple command. As mentioned in the thread, I think demodir in its current form is obsolete when we release emojivoto.

I have tried to add a similar script to the one currently generating the coordinator in the release. It does not work at the moment and I am trying to understand why

.github/workflows/release.yml Outdated Show resolved Hide resolved
.github/workflows/release.yml Outdated Show resolved Hide resolved
packages/scripts.nix Outdated Show resolved Hide resolved
@wirungu
Copy link
Contributor Author

wirungu commented Apr 22, 2024

I believe there is now at least a correctly generated and patched demo being produced in the release, so the E2E release testing can at least proceed. I'm really sorry about the delay.
Some questions:

  • Should the initializer also have release tags added?
  • Should the demodir target now be removed?

@burgerdev
Copy link
Contributor

Overall lgtm, but the demodir target is still broken afaict. Maybe it would make sense to revert the justfile changes in this PR and focus on the release?

@wirungu wirungu force-pushed the mi/e2e-emoji-release branch from 435c6d4 to 29c0f9e Compare April 22, 2024 14:20
@wirungu wirungu marked this pull request as ready for review April 22, 2024 14:33
@wirungu wirungu force-pushed the mi/e2e-emoji-release branch from 29c0f9e to 325c93f Compare April 22, 2024 15:01
@burgerdev burgerdev force-pushed the mi/e2e-emoji-release branch from 325c93f to 2233e9b Compare April 23, 2024 06:08
@burgerdev
Copy link
Contributor

I rebased this and fixed the merge conflict with node-installer. Once tests pass, I'll hit merge.

@burgerdev burgerdev force-pushed the mi/e2e-emoji-release branch from 2233e9b to ecc6b66 Compare April 23, 2024 16:13
@burgerdev burgerdev changed the title e2e: fix demo generation e2e: add emojivoto to release Apr 23, 2024
@burgerdev burgerdev merged commit 619fbf1 into main Apr 23, 2024
8 checks passed
@burgerdev burgerdev deleted the mi/e2e-emoji-release branch April 23, 2024 16:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no changelog PRs not listed in the release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants