Skip to content

Commit

Permalink
Upgrade hosted Ubuntu agents to 18.04 (#4431)
Browse files Browse the repository at this point in the history
Replace some remaining references to Ubuntu 16.04 with 18.04.

Note our release pipeline for docker images (`images-release.yaml`) calls `install.sh` with the `--package-arm` argument, which hasn't been updated for 18.04. That's a bigger effort that would need to be resolved before this can be merged (or handled in a separate PR).
  • Loading branch information
damonbarry committed Feb 19, 2021
1 parent 63b19ce commit 04f005f
Show file tree
Hide file tree
Showing 21 changed files with 41 additions and 101 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Expand Up @@ -48,7 +48,7 @@ Provide a detailed set of steps to reproduce the bug.
</details>

### Device Information
* Host OS [e.g. Ubuntu 16.04, Ubuntu 18.04, Windows IoT Core]:
* Host OS [e.g. Ubuntu 18.04, Windows Server IoT 2019]:
* Architecture [e.g. amd64, arm32, arm64]:
* Container OS [e.g. Linux containers, Windows containers]:

Expand Down
4 changes: 2 additions & 2 deletions builds/checkin/api-proxy.yaml
Expand Up @@ -11,7 +11,7 @@ jobs:
################################################################################
displayName: Check pipeline preconditions (changes ARE in builds or edge-modules/api-proxy-module or mqtt/edgelet-client)
pool:
vmImage: "ubuntu-16.04"
vmImage: "ubuntu-18.04"
steps:
- bash: |
git log -m -1 --name-only --first-parent --pretty="" | egrep -i '^(builds|edge-modules/api-proxy-module|mqtt/edgelet-client)'
Expand All @@ -29,7 +29,7 @@ jobs:
dependsOn: check_run_pipeline
condition: eq(dependencies.check_run_pipeline.outputs['check_files.RUN_PIPELINE'], 'true')
pool:
vmImage: "ubuntu-16.04"
vmImage: "ubuntu-18.04"
steps:
- script: echo "##vso[task.setvariable variable=NO_VALGRIND;]true"
displayName: Set env variables
Expand Down
4 changes: 2 additions & 2 deletions builds/checkin/dotnet.yaml
Expand Up @@ -13,7 +13,7 @@ jobs:
################################################################################
displayName: Check pipeline preconditions (changes ARE NOT in either edgelet, docs, or mqtt folder)
pool:
vmImage: "ubuntu-16.04"
vmImage: "ubuntu-18.04"
steps:
- bash: |
git log -m -1 --name-only --first-parent --pretty="" | egrep -i -v '^(edgelet|doc|mqtt)'
Expand All @@ -31,7 +31,7 @@ jobs:
dependsOn: check_run_pipeline
condition: eq(dependencies.check_run_pipeline.outputs['check_files.RUN_PIPELINE'], 'true')
pool:
vmImage: "ubuntu-16.04"
vmImage: "ubuntu-18.04"
steps:
- template: ../templates/install-dotnet2.yaml
- template: ../templates/install-dotnet3.yaml
Expand Down
12 changes: 6 additions & 6 deletions builds/checkin/edgelet.yaml
Expand Up @@ -13,7 +13,7 @@ jobs:
################################################################################
displayName: Check pipeline preconditions (changes ARE in builds or edgelet)
pool:
vmImage: "ubuntu-16.04"
vmImage: "ubuntu-18.04"
steps:
- bash: |
git log -m -1 --name-only --first-parent --pretty="" | egrep -i '^(builds|edgelet)'
Expand All @@ -31,7 +31,7 @@ jobs:
dependsOn: check_run_pipeline
condition: eq(dependencies.check_run_pipeline.outputs['check_files.RUN_PIPELINE'], 'true')
pool:
vmImage: "ubuntu-16.04"
vmImage: "ubuntu-18.04"
steps:
- script: echo "##vso[task.setvariable variable=NO_VALGRIND;]true"
displayName: Set env variables
Expand All @@ -51,7 +51,7 @@ jobs:
dependsOn: check_run_pipeline
condition: eq(dependencies.check_run_pipeline.outputs['check_files.RUN_PIPELINE'], 'true')
pool:
vmImage: "ubuntu-16.04"
vmImage: "ubuntu-18.04"
variables:
IOTEDGE_HOMEDIR: /tmp
steps:
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
dependsOn: check_run_pipeline
condition: eq(dependencies.check_run_pipeline.outputs['check_files.RUN_PIPELINE'], 'true')
pool:
vmImage: "ubuntu-16.04"
vmImage: "ubuntu-18.04"
variables:
IOTEDGE_HOMEDIR: /tmp
steps:
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
dependsOn: check_run_pipeline
condition: eq(dependencies.check_run_pipeline.outputs['check_files.RUN_PIPELINE'], 'true')
pool:
vmImage: "ubuntu-16.04"
vmImage: "ubuntu-18.04"
steps:
- script: echo "##vso[task.setvariable variable=NO_VALGRIND;]true"
displayName: Set env variables
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
# coverage.goal: 68
# rust.toolchain: nightly-2020-04-10
# pool:
# vmImage: "ubuntu-16.04"
# vmImage: "ubuntu-18.04"
# steps:
# - script: |
# echo "##vso[task.setvariable variable=NO_VALGRIND;]true"
Expand Down
6 changes: 3 additions & 3 deletions builds/checkin/mqtt.yaml
Expand Up @@ -11,7 +11,7 @@ jobs:
################################################################################
displayName: Check pipeline preconditions (changes ARE in builds or mqtt)
pool:
vmImage: "ubuntu-16.04"
vmImage: "ubuntu-18.04"
steps:
- checkout: self
submodules: false
Expand All @@ -32,7 +32,7 @@ jobs:
dependsOn: check_run_pipeline
condition: eq(dependencies.check_run_pipeline.outputs['check_files.RUN_PIPELINE'], 'true')
pool:
vmImage: "ubuntu-16.04"
vmImage: "ubuntu-18.04"
steps:
- checkout: self
submodules: false # mqtt broker does not use submodules
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
dependsOn: check_run_pipeline
condition: eq(dependencies.check_run_pipeline.outputs['check_files.RUN_PIPELINE'], 'true')
pool:
vmImage: "ubuntu-16.04"
vmImage: "ubuntu-18.04"
steps:
- checkout: self
submodules: false # mqtt broker does not use submodules
Expand Down
4 changes: 2 additions & 2 deletions builds/checkin/rust-test-modules.yaml
Expand Up @@ -10,7 +10,7 @@ jobs:
################################################################################
displayName: Check pipeline preconditions (changes ARE in builds or test modules)
pool:
vmImage: "ubuntu-16.04"
vmImage: "ubuntu-18.04"
steps:
- checkout: self
submodules: false
Expand All @@ -31,7 +31,7 @@ jobs:
dependsOn: check_run_pipeline
condition: eq(dependencies.check_run_pipeline.outputs['check_files.RUN_PIPELINE'], 'true')
pool:
vmImage: "ubuntu-16.04"
vmImage: "ubuntu-18.04"
steps:
- checkout: self
submodules: false
Expand Down
4 changes: 2 additions & 2 deletions builds/checkin/watchdog.yaml
Expand Up @@ -11,7 +11,7 @@ jobs:
################################################################################
displayName: Check pipeline preconditions (changes ARE in builds or watchdog)
pool:
vmImage: "ubuntu-16.04"
vmImage: "ubuntu-18.04"
steps:
- bash: |
git log -m -1 --name-only --first-parent --pretty="" | egrep -i '^(builds|edge-hub/watchdog)'
Expand All @@ -29,7 +29,7 @@ jobs:
dependsOn: check_run_pipeline
condition: eq(dependencies.check_run_pipeline.outputs['check_files.RUN_PIPELINE'], 'true')
pool:
vmImage: "ubuntu-16.04"
vmImage: "ubuntu-18.04"
steps:
- script: echo "##vso[task.setvariable variable=RUST_BACKTRACE;]1"
displayName: Set env variables
Expand Down
2 changes: 1 addition & 1 deletion builds/ci/dotnet.yaml
Expand Up @@ -16,7 +16,7 @@ jobs:
displayName: Linux
timeoutInMinutes: 120
pool:
vmImage: ubuntu-16.04
vmImage: ubuntu-18.04
variables:
testEnvironment: linux
steps:
Expand Down
6 changes: 3 additions & 3 deletions builds/ci/edgelet.yaml
Expand Up @@ -18,7 +18,7 @@ jobs:
################################################################################
displayName: Linux amd64
pool:
vmImage: 'ubuntu-16.04'
vmImage: 'ubuntu-18.04'
steps:
- script: echo "##vso[task.setvariable variable=NO_VALGRIND;]true"
displayName: Set env variables
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
displayName: Linux arm32v7
timeoutInMinutes: 90
pool:
vmImage: 'ubuntu-16.04'
vmImage: 'ubuntu-18.04'
steps:
- script: |
echo "##vso[task.setvariable variable=RUSTUP_HOME;]$VSTS_WORK/rustup"
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
################################################################################
displayName: Style Check
pool:
vmImage: 'ubuntu-16.04'
vmImage: 'ubuntu-18.04'
steps:
- script: |
echo "##vso[task.setvariable variable=NO_VALGRIND;]true"
Expand Down
4 changes: 2 additions & 2 deletions builds/ci/mqtt.yaml
Expand Up @@ -19,7 +19,7 @@ jobs:
################################################################################
displayName: Linux amd64
pool:
vmImage: 'ubuntu-16.04'
vmImage: 'ubuntu-18.04'
steps:
- checkout: self
submodules: false # mqtt broker does not use submodules
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
################################################################################
displayName: Linux arm32v7
pool:
vmImage: 'ubuntu-16.04'
vmImage: 'ubuntu-18.04'
steps:
- checkout: self
submodules: false # mqtt broker does not use submodules
Expand Down
2 changes: 1 addition & 1 deletion builds/e2e/stresstest.yaml
Expand Up @@ -45,7 +45,7 @@ jobs:
- Agent.OSArchitecture -equals X64
- run-stress -equals true
variables:
edgelet.artifact.name: 'iotedged-ubuntu16.04-amd64'
edgelet.artifact.name: 'iotedged-ubuntu18.04-amd64'
steps:
- checkout: none
- task: AzureKeyVault@1
Expand Down
4 changes: 2 additions & 2 deletions builds/misc/images-release.yaml
Expand Up @@ -10,7 +10,7 @@ jobs:
timeoutInMinutes: 180
displayName: LinuxDotnet
pool:
name: "Hosted Ubuntu 1604"
vmImage: ubuntu-18.04
steps:
# Setup dependencies
- bash: |
Expand Down Expand Up @@ -331,7 +331,7 @@ jobs:
################################################################################
displayName: Publish Manifest Images
pool:
vmImage: 'ubuntu-16.04'
vmImage: 'ubuntu-18.04'
dependsOn:
- linux_dotnet_projects
steps:
Expand Down
4 changes: 2 additions & 2 deletions builds/misc/images.yaml
Expand Up @@ -16,7 +16,7 @@ jobs:
timeoutInMinutes: 180
displayName: LinuxDotnet
pool:
vmImage: 'ubuntu-16.04'
vmImage: 'ubuntu-18.04'
steps:
- template: ../templates/install-dotnet2.yaml
- template: ../templates/install-dotnet3.yaml
Expand Down Expand Up @@ -232,7 +232,7 @@ jobs:
################################################################################
displayName: Manifest
pool:
vmImage: 'ubuntu-16.04'
vmImage: 'ubuntu-18.04'
dependsOn:
- linux_dotnet_projects
- linux_API_proxy_module
Expand Down
2 changes: 1 addition & 1 deletion builds/service/service-deployment.yaml
Expand Up @@ -11,7 +11,7 @@ schedules:
always: true

pool:
vmImage: ubuntu-16.04
vmImage: ubuntu-18.04

steps:
- checkout: self
Expand Down
4 changes: 2 additions & 2 deletions doc/EdgeRuntimeConfigSpec.md
Expand Up @@ -26,7 +26,7 @@ of values that these KV pairs can take.
| ----------:|:----------:|:---------------------------- |
| platform | string | "Windows", "Linux" |
| osName | string | "Windows", "Ubuntu", "CentOS"|
| osVersion | string | "10.0.15063", "16.04" |
| osVersion | string | "10.0.15063", "18.04" |

>### Edge Hub
Expand Down Expand Up @@ -57,7 +57,7 @@ The following is a cumulative JSON representation of the data using sample data:
"platform": "Linux",
"os": {
"name": "Ubuntu",
"version: "16.04"
"version: "18.04"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion edgelet/doc/devguide.md
Expand Up @@ -81,7 +81,7 @@ yum install \
libcurl-devel libuuid-devel openssl-devel
```

#### Debian 8-10, Ubuntu 16.04, Ubuntu 18.04
#### Debian 8-10, Ubuntu 18.04

```sh
apt-get update
Expand Down
30 changes: 0 additions & 30 deletions scripts/docker-build/README.md

This file was deleted.

31 changes: 0 additions & 31 deletions scripts/docker-build/linux/amd64/Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/linux/NestTestHelper.sh
Expand Up @@ -57,7 +57,7 @@ function get_iotedged_artifact_folder() {

local path
if [ "$image_architecture_label" = 'amd64' ]; then
path="$testDir/artifacts/iotedged-ubuntu16.04-amd64"
path="$testDir/artifacts/iotedged-ubuntu18.04-amd64"
elif [ "$image_architecture_label" = 'arm64v8' ]; then
path="$testDir/artifacts/iotedged-ubuntu18.04-aarch64"
else
Expand Down

0 comments on commit 04f005f

Please sign in to comment.