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

OVMF boot issue workaround #1041

Merged
merged 4 commits into from
Nov 13, 2024
Merged

OVMF boot issue workaround #1041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c52a8fe
OVMF boot issue workaround (1/2): add working OVMF firmware files
shjala Nov 8, 2024
d4904c2
OVMF boot issue workaround (2/2): update setup-environment action
shjala Nov 8, 2024
71b9595
evetestkit : fix panic on EveDeployApp
shjala Nov 11, 2024
c455fe5
github actions setup-environment: support rc tag
shjala Nov 11, 2024
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
5 changes: 4 additions & 1 deletion .github/actions/setup-environment/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ runs:
./eden config set default --key=eve.accel --value=true
else
./eden config set default --key=eve.accel --value=false
./eden config set default --key=eve.firmware --value="$(pwd)/firmware/OVMF_CODE.fd $(pwd)/firmware/OVMF_VARS.fd"
fi
./eden config set default --key=eve.tpm --value=${{ inputs.tpm_enabled }}
./eden config set default --key=eve.cpu --value=2
Expand All @@ -85,8 +86,10 @@ runs:
echo "Setting up eve image ${image}"
eve_pr_registry=$(echo "$image" | cut -d ':' -f 1)
eve_pr=$(echo "$image" | cut -d ':' -f 2 | cut -d "-" -f1)
# this will be empty if there is no rc in the tag
eve_rc=$(echo "$image" | cut -d ':' -f 2 | grep -Eo "\-rc[0-9]+" || printf "")
./eden config set default --key=eve.registry --value="$eve_pr_registry"
./eden config set default --key=eve.tag --value="$eve_pr"
./eden config set default --key=eve.tag --value="$eve_pr$eve_rc"
else
echo "Skipping setting up eve image ${image}"
fi
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/eden_setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ jobs:
# check separate (non-default) config
./eden config add setup
./eden config set setup --key=eve.accel --value=false
./eden config set setup --key=eve.firmware --value="$(pwd)/firmware/OVMF_CODE.fd $(pwd)/firmware/OVMF_VARS.fd"
./eden --config setup setup
./eden --config setup start
./eden --config setup eve onboard
Expand Down
Binary file added firmware/OVMF.fd
View file
Open in desktop
Binary file not shown.
Binary file added firmware/OVMF_CODE.fd
View file
Open in desktop
Binary file not shown.
Binary file added firmware/OVMF_VARS.fd
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion pkg/evetestkit/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,8 @@ func (node *EveNode) EveRebootAndWait(timeoutSeconds uint) error {
// EveDeployApp deploys a VM/App on the EVE node
func (node *EveNode) EveDeployApp(appLink string, destructiveUse bool, pc openevec.PodConfig, options ...AppOption) error {
app := appInstanceConfig{name: pc.Name, destructiveUse: destructiveUse}
node.apps = append(node.apps, app)

for _, option := range options {
option(node, pc.Name)
}
Expand All @@ -507,7 +509,6 @@ func (node *EveNode) EveDeployApp(appLink string, destructiveUse bool, pc openev
}
}

node.apps = append(node.apps, app)
return node.controller.PodDeploy(appLink, pc, node.cfg)
}

Expand Down
Loading