Skip to content

toil(front): update default from ubuntu2004 to ubuntu2204 #845

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

Draft
skipi wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

toil(front): update default from ubuntu2004 to ubuntu2204 #845

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
4 changes: 2 additions & 2 deletions front/lib/front_web/controllers/project_controller.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,12 +271,12 @@ defmodule FrontWeb.ProjectController do

%{
agent_types: combined,
# We want new pipelines constructed through the Workflow Editor to use ubuntu2004
# We want new pipelines constructed through the Workflow Editor to use ubuntu2204
# as the default OS image for Linux. However, to avoid breaking builds, Zebra still
# uses ubuntu1804 as the default one if you don't specify anything in your YAML.
# Once we deprecate the Ubuntu 18.04 image, we should be able to remove this hardcoded
# value from here and use hosted_agent_types.default_linux_os_image again.
default_linux_os_image: "ubuntu2004",
default_linux_os_image: "ubuntu2204",
default_mac_os_image: hosted_agent_types.default_mac_os_image
}
end
Expand Down
4 changes: 2 additions & 2 deletions front/lib/front_web/controllers/workflow_controller.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,12 +456,12 @@ defmodule FrontWeb.WorkflowController do

%{
agent_types: combined,
# We want new pipelines constructed through the Workflow Editor to use ubuntu2004
# We want new pipelines constructed through the Workflow Editor to use ubuntu2204
# as the default OS image for Linux. However, to avoid breaking builds, Zebra still
# uses ubuntu1804 as the default one if you don't specify anything in your YAML.
# Once we deprecate the Ubuntu 18.04 image, we should be able to remove this hardcoded
# value from here and use hosted_agent_types.default_linux_os_image again.
default_linux_os_image: "ubuntu2004",
default_linux_os_image: "ubuntu2204",
default_mac_os_image: hosted_agent_types.default_mac_os_image
}
end
Expand Down
2 changes: 1 addition & 1 deletion front/test/front/models/agent_type_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ defmodule Front.Models.AgentTypeTest do
{:ok, agent_type_list} = AgentType.list(org_id)

assert %{
default_linux_os_image: "ubuntu2004",
default_linux_os_image: "ubuntu2204",
default_mac_os_image: "macos-xcode13"
} = agent_type_list

Expand Down