Skip to content

Fork Sync: Update from parent repository #470

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

Merged
merged 1 commit into from
Oct 23, 2023
Merged

Fork Sync: Update from parent repository #470

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 docs/getting-started.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,14 @@ $ onefuzz pools create my-pool linux --query pool_id
"9e779388-a9c2-4934-9fa2-6ed6f6a7792a"
```

To create a managed scaleset of Ubuntu 20.04 VMs using a [general purpose
To create a managed scaleset of Ubuntu 22.04 VMs using a [general purpose
Azure VM](https://docs.microsoft.com/en-us/azure/virtual-machines/sizes) that
belongs to the pool:

```console
$ onefuzz scalesets create my-pool $VM_COUNT
{
"image": "Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest",
"image": "Canonical:0001-com-ubuntu-server-jammy:22_04-lts:latest",
"pool_name": "my-pool",
"region": "eastus",
"scaleset_id": "eb1e9602-4acf-40b8-9216-a5d598d27195",
Expand Down
4 changes: 2 additions & 2 deletions docs/supported-platforms.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ OneFuzz deploys targets into Azure Virtual Machine Scale Sets for fuzzing (and
supporting tasks). OneFuzz permits arbitrary choice of VM SKU and OS Image,
including custom images. We continuously test on Window 11 Pro x64 (using the
Azure OS image URN `MicrosoftWindowsDesktop:Windows-11:win11-22h2-pro:latest`)
and Ubuntu 20.04 LTS x64 (using the Azure OS image URN
`Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest`).
and Ubuntu 22.04 LTS x64 (using the Azure OS image URN
`Canonical:0001-com-ubuntu-server-jammy:22_04-lts:latest`).

### LibFuzzer Compilation

Expand Down
8 changes: 4 additions & 4 deletions docs/webhook_events.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ If webhook is set to have Event Grid message format then the payload will look a
"allowed_aad_tenants": [
"00000000-0000-0000-0000-000000000000"
],
"default_linux_vm_image": "Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest",
"default_linux_vm_image": "Canonical:0001-com-ubuntu-server-jammy:22_04-lts:latest",
"default_windows_vm_image": "MicrosoftWindowsDesktop:Windows-11:win11-22h2-pro:latest",
"network_config": {
"address_space": "10.0.0.0/8",
Expand Down Expand Up @@ -868,7 +868,7 @@ If webhook is set to have Event Grid message format then the payload will look a
"type": "object"
},
"default_linux_vm_image": {
"default": "Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest",
"default": "Canonical:0001-com-ubuntu-server-jammy:22_04-lts:latest",
"title": "Default Linux Vm Image",
"type": "string"
},
Expand Down Expand Up @@ -2576,7 +2576,7 @@ If webhook is set to have Event Grid message format then the payload will look a

```json
{
"image": "Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest",
"image": "Canonical:0001-com-ubuntu-server-jammy:22_04-lts:latest",
"pool_name": "example",
"region": "eastus",
"scaleset_id": "example-000",
Expand Down Expand Up @@ -6215,7 +6215,7 @@ If webhook is set to have Event Grid message format then the payload will look a
"type": "object"
},
"default_linux_vm_image": {
"default": "Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest",
"default": "Canonical:0001-com-ubuntu-server-jammy:22_04-lts:latest",
"title": "Default Linux Vm Image",
"type": "string"
},
Expand Down
2 changes: 1 addition & 1 deletion src/ApiService/ApiService/onefuzzlib/ImageReference.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace Microsoft.OneFuzz.Service;

public static class DefaultImages {
public static readonly ImageReference Windows = ImageReference.MustParse("MicrosoftWindowsDesktop:Windows-11:win11-22h2-pro:latest");
public static readonly ImageReference Linux = ImageReference.MustParse("Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest");
public static readonly ImageReference Linux = ImageReference.MustParse("Canonical:0001-com-ubuntu-server-jammy:22_04-lts:latest");
}

[JsonConverter(typeof(Converter<ImageReference>))]
Expand Down
2 changes: 1 addition & 1 deletion src/pytypes/extra/generate-docs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ def main() -> None:
scaleset_id="example-000",
pool_name=PoolName("example"),
vm_sku="Standard_D2s_v3",
image="Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest",
image="Canonical:0001-com-ubuntu-server-jammy:22_04-lts:latest",
region=Region("eastus"),
size=10,
),
Expand Down
2 changes: 1 addition & 1 deletion src/pytypes/onefuzztypes/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ class InstanceConfig(BaseModel):
default="MicrosoftWindowsDesktop:Windows-11:win11-22h2-pro:latest"
)
default_linux_vm_image: str = Field(
default="Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest"
default="Canonical:0001-com-ubuntu-server-jammy:22_04-lts:latest"
)
proxy_vm_sku: str = Field(default="Standard_B2s")
api_access_rules: Optional[Dict[Endpoint, ApiAccessRule]] = None
Expand Down
6 changes: 3 additions & 3 deletions src/pytypes/tests/test_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def test_scaleset_size(self) -> None:
scaleset_id="test-pool-000",
pool_name=PoolName("test-pool"),
vm_sku="Standard_D2ds_v4",
image="Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest",
image="Canonical:0001-com-ubuntu-server-jammy:22_04-lts:latest",
region=Region("westus2"),
size=-1,
spot_instances=False,
Expand All @@ -67,7 +67,7 @@ def test_scaleset_size(self) -> None:
scaleset_id="test-pool-000",
pool_name=PoolName("test-pool"),
vm_sku="Standard_D2ds_v4",
image="Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest",
image="Canonical:0001-com-ubuntu-server-jammy:22_04-lts:latest",
region=Region("westus2"),
size=0,
spot_instances=False,
Expand All @@ -78,7 +78,7 @@ def test_scaleset_size(self) -> None:
scaleset_id="test-pool-000",
pool_name=PoolName("test-pool"),
vm_sku="Standard_D2ds_v4",
image="Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest",
image="Canonical:0001-com-ubuntu-server-jammy:22_04-lts:latest",
region=Region("westus2"),
size=80,
spot_instances=False,
Expand Down