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.

Sign up for GitHub

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

Jump to bottom

fix: wait for upgrade to complete #3371

Merged
merged 1 commit into from
Nov 12, 2024
Merged

fix: wait for upgrade to complete #3371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/smoketest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
run: |
set -euo pipefail
echo "Running smoke test on the HEAD images"
go test -v -timeout 15m -tags smoketest -run '^Test' ./smoketest
OLD_FTL_VERSION=${{ env.LATEST_VERSION }} go test -v -timeout 15m -tags smoketest -run '^Test' ./smoketest
- name: Archive Report
uses: actions/upload-artifact@v4
if: always()
Expand Down
4 changes: 4 additions & 0 deletions deployment/Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ wait-for-kube:
sleep 1
ftl status || sleep 5 && ftl status

wait-for-version-upgrade oldversion:
#!/bin/bash
while [ "$(ftl status | yq '.controllers[0].version')" == {{oldversion}} ]; do sleep 1; done
ftl status

setup-registry:
#!/bin/bash
Expand Down
4 changes: 4 additions & 0 deletions internal/integration/harness.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,10 @@ func run(t *testing.T, actionsOrOptions ...ActionOrOption) {
dumpKubePods(ctx, optional.Ptr(kubeClient), kubeNamespace)
}
assert.NoError(t, err)
ver := os.Getenv("OLD_FTL_VERSION")
if ver != "" {
err = ftlexec.Command(ctx, log.Debug, filepath.Join(rootDir, "deployment"), "just", "wait-for-version-upgrade", ver).RunBuffered(ctx)
}
} else if opts.console {
Infof("Building ftl with console")
err = ftlexec.Command(ctx, log.Debug, rootDir, "just", "build", "ftl").RunBuffered(ctx)
Expand Down
Loading