From 70a324c65aa6cfd9cc1125d45f46c578bc627ea3 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 29 Nov 2023 12:47:46 +0000 Subject: [PATCH 01/68] Try the new aosp_atd emulators --- .../CreateAndroidEmulator.cs | 2 +- build-tools/automation/azure-pipelines-nightly.yaml | 2 +- build-tools/scripts/TestApks.targets | 4 ++-- .../ConfigAndData/Dependencies/AndroidToolchain.cs | 6 ++++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CreateAndroidEmulator.cs b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CreateAndroidEmulator.cs index 8d8d1754a22..45791a2d0ff 100644 --- a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CreateAndroidEmulator.cs +++ b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CreateAndroidEmulator.cs @@ -24,7 +24,7 @@ public class CreateAndroidEmulator : ToolTask public string ImageName {get; set;} = "XamarinAndroidTestRunner64"; public string DeviceName {get; set;} = "pixel_4"; - public string ImageType {get; set;} = "default"; + public string ImageType {get; set;} = "google_atd"; public string DataPartitionSizeMB {get; set;} = "2048"; public string RamSizeMB {get; set;} = "2048"; diff --git a/build-tools/automation/azure-pipelines-nightly.yaml b/build-tools/automation/azure-pipelines-nightly.yaml index 4f5ce4c33ac..d63b77e8185 100644 --- a/build-tools/automation/azure-pipelines-nightly.yaml +++ b/build-tools/automation/azure-pipelines-nightly.yaml @@ -114,7 +114,7 @@ stages: Android33-x86_64: avdApiLevel: 33 avdAbi: x86_64 - avdType: google_apis + avdType: google_atd pool: vmImage: $(HostedMacImage) workspace: diff --git a/build-tools/scripts/TestApks.targets b/build-tools/scripts/TestApks.targets index 8629e00274d..e5714a67a1e 100644 --- a/build-tools/scripts/TestApks.targets +++ b/build-tools/scripts/TestApks.targets @@ -19,10 +19,10 @@ android-arm64;android-x86;android-x64; - 29 + 33 arm64-v8a x86_64 - default + google_atd true false -no-window -no-boot-anim $(TestAvdExtraBootArgs) diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs index 72a9498277c..a7185d46524 100644 --- a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs +++ b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs @@ -97,6 +97,12 @@ public AndroidToolchain () pkgRevision: "8", dependencyType: AndroidToolchainComponentType.EmulatorDependency ), + new AndroidToolchainComponent (isArm64Apple ? $"{systemImageArch}-33_r02" : $"{systemImageArch}-33_r02", + destDir: Path.Combine ("system-images", "android-33", "google_atd", systemImageArch), + relativeUrl: new Uri ("sys-img/android/", UriKind.Relative), + pkgRevision: "2", + dependencyType: AndroidToolchainComponentType.EmulatorDependency + ), new AndroidToolchainComponent ($"android-ndk-r{AndroidNdkVersion}-{osTag}", destDir: AndroidNdkDirectory, pkgRevision: AndroidPkgRevision, From 7e8b85fb0e385cbb18b9bea0f005c34bf7001825 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 30 Nov 2023 14:05:33 +0000 Subject: [PATCH 02/68] revert to default for api 33 emulator --- .../CreateAndroidEmulator.cs | 2 +- build-tools/automation/azure-pipelines-nightly.yaml | 2 +- build-tools/scripts/TestApks.targets | 2 +- .../xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CreateAndroidEmulator.cs b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CreateAndroidEmulator.cs index 45791a2d0ff..8d8d1754a22 100644 --- a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CreateAndroidEmulator.cs +++ b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CreateAndroidEmulator.cs @@ -24,7 +24,7 @@ public class CreateAndroidEmulator : ToolTask public string ImageName {get; set;} = "XamarinAndroidTestRunner64"; public string DeviceName {get; set;} = "pixel_4"; - public string ImageType {get; set;} = "google_atd"; + public string ImageType {get; set;} = "default"; public string DataPartitionSizeMB {get; set;} = "2048"; public string RamSizeMB {get; set;} = "2048"; diff --git a/build-tools/automation/azure-pipelines-nightly.yaml b/build-tools/automation/azure-pipelines-nightly.yaml index d63b77e8185..8c9c046454b 100644 --- a/build-tools/automation/azure-pipelines-nightly.yaml +++ b/build-tools/automation/azure-pipelines-nightly.yaml @@ -114,7 +114,7 @@ stages: Android33-x86_64: avdApiLevel: 33 avdAbi: x86_64 - avdType: google_atd + avdType: default pool: vmImage: $(HostedMacImage) workspace: diff --git a/build-tools/scripts/TestApks.targets b/build-tools/scripts/TestApks.targets index e5714a67a1e..c7e0417fde6 100644 --- a/build-tools/scripts/TestApks.targets +++ b/build-tools/scripts/TestApks.targets @@ -22,7 +22,7 @@ 33 arm64-v8a x86_64 - google_atd + default true false -no-window -no-boot-anim $(TestAvdExtraBootArgs) diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs index a7185d46524..1f299cdb97d 100644 --- a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs +++ b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs @@ -98,7 +98,7 @@ public AndroidToolchain () dependencyType: AndroidToolchainComponentType.EmulatorDependency ), new AndroidToolchainComponent (isArm64Apple ? $"{systemImageArch}-33_r02" : $"{systemImageArch}-33_r02", - destDir: Path.Combine ("system-images", "android-33", "google_atd", systemImageArch), + destDir: Path.Combine ("system-images", "android-33", "default", systemImageArch), relativeUrl: new Uri ("sys-img/android/", UriKind.Relative), pkgRevision: "2", dependencyType: AndroidToolchainComponentType.EmulatorDependency From 33b3e99c035d5c8336970ea03a6b6cdbf99fbd8f Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 10 Jan 2024 13:46:49 +0000 Subject: [PATCH 03/68] Test a Container --- .../automation/yaml-templates/build-windows.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/build-tools/automation/yaml-templates/build-windows.yaml b/build-tools/automation/yaml-templates/build-windows.yaml index 92cbd13ccb7..786dc3717e3 100644 --- a/build-tools/automation/yaml-templates/build-windows.yaml +++ b/build-tools/automation/yaml-templates/build-windows.yaml @@ -13,6 +13,20 @@ parameters: # This stage ensures Windows specific build steps continue to work, and runs unit tests. stages: +- stage: Test Container + displayName: Test Container + jobs: + - job: Test + pool: + vmImage: 'ubuntu-latest' + container: ubuntu:18.04 + steps: + - script: printenv + - script: > + sudo apt install curl ca-certificates -y + curl https://repo.waydro.id | sudo bash + sudo apt install waydroid -y + - stage: ${{ parameters.stageName }} displayName: ${{ parameters.stageDisplayName }} dependsOn: ${{ parameters.dependsOn }} From 020b6d17a2ff0a88178ec4584047c58f2b522465 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 10 Jan 2024 13:54:27 +0000 Subject: [PATCH 04/68] ff --- build-tools/automation/yaml-templates/build-windows.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/automation/yaml-templates/build-windows.yaml b/build-tools/automation/yaml-templates/build-windows.yaml index 786dc3717e3..ab6fac01381 100644 --- a/build-tools/automation/yaml-templates/build-windows.yaml +++ b/build-tools/automation/yaml-templates/build-windows.yaml @@ -13,7 +13,7 @@ parameters: # This stage ensures Windows specific build steps continue to work, and runs unit tests. stages: -- stage: Test Container +- stage: TestContainer displayName: Test Container jobs: - job: Test From f3a15f3a01793a3105b08f21082aa0e5977c6a73 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 10 Jan 2024 14:48:41 +0000 Subject: [PATCH 05/68] ff --- build-tools/automation/yaml-templates/build-windows.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-tools/automation/yaml-templates/build-windows.yaml b/build-tools/automation/yaml-templates/build-windows.yaml index ab6fac01381..517fc770098 100644 --- a/build-tools/automation/yaml-templates/build-windows.yaml +++ b/build-tools/automation/yaml-templates/build-windows.yaml @@ -23,9 +23,9 @@ stages: steps: - script: printenv - script: > - sudo apt install curl ca-certificates -y - curl https://repo.waydro.id | sudo bash - sudo apt install waydroid -y + apt install curl ca-certificates -y + curl https://repo.waydro.id | bash + apt install waydroid -y - stage: ${{ parameters.stageName }} displayName: ${{ parameters.stageDisplayName }} From 5ba6aeee12a351ec5e43eb514eb0d2d3afcf7096 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 10 Jan 2024 15:23:25 +0000 Subject: [PATCH 06/68] ff --- build-tools/automation/yaml-templates/build-windows.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-tools/automation/yaml-templates/build-windows.yaml b/build-tools/automation/yaml-templates/build-windows.yaml index 517fc770098..283e29ff000 100644 --- a/build-tools/automation/yaml-templates/build-windows.yaml +++ b/build-tools/automation/yaml-templates/build-windows.yaml @@ -19,13 +19,13 @@ stages: - job: Test pool: vmImage: 'ubuntu-latest' - container: ubuntu:18.04 + container: ubuntu:20.04 steps: - script: printenv - script: > - apt install curl ca-certificates -y - curl https://repo.waydro.id | bash - apt install waydroid -y + sudo apt install curl ca-certificates -y && + curl https://repo.waydro.id | sudo bash && + sudo apt install waydroid -y - stage: ${{ parameters.stageName }} displayName: ${{ parameters.stageDisplayName }} From af2a894c66cac4fbb8be3f0399f1ffaa1de87f9d Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 10 Jan 2024 22:34:31 +0000 Subject: [PATCH 07/68] ff --- build-tools/automation/yaml-templates/build-windows.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-tools/automation/yaml-templates/build-windows.yaml b/build-tools/automation/yaml-templates/build-windows.yaml index 283e29ff000..e04b5f2e9e7 100644 --- a/build-tools/automation/yaml-templates/build-windows.yaml +++ b/build-tools/automation/yaml-templates/build-windows.yaml @@ -17,9 +17,9 @@ stages: displayName: Test Container jobs: - job: Test - pool: - vmImage: 'ubuntu-latest' - container: ubuntu:20.04 + pool: ${{ parameters.buildPool }} + container: + image: ubuntu:18.04 steps: - script: printenv - script: > From d89085290a4eb9c9e7515fe3c27eff49e84c6fe3 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 11 Jan 2024 00:24:22 +0000 Subject: [PATCH 08/68] ff --- .../automation/yaml-templates/build-windows.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/build-tools/automation/yaml-templates/build-windows.yaml b/build-tools/automation/yaml-templates/build-windows.yaml index e04b5f2e9e7..a32cba59178 100644 --- a/build-tools/automation/yaml-templates/build-windows.yaml +++ b/build-tools/automation/yaml-templates/build-windows.yaml @@ -17,15 +17,16 @@ stages: displayName: Test Container jobs: - job: Test - pool: ${{ parameters.buildPool }} + pool: + vmImage: 'ubuntu-latest' container: - image: ubuntu:18.04 + image: ubuntu:20.04 steps: - script: printenv - - script: > - sudo apt install curl ca-certificates -y && - curl https://repo.waydro.id | sudo bash && - sudo apt install waydroid -y + - script: | + apt install curl ca-certificates -y + curl https://repo.waydro.id | bash + apt install waydroid -y - stage: ${{ parameters.stageName }} displayName: ${{ parameters.stageDisplayName }} From 4f2563df80206c32ec1706355f4a0b2c68459385 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 11 Jan 2024 00:42:54 +0000 Subject: [PATCH 09/68] ff --- build-tools/automation/yaml-templates/build-windows.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build-tools/automation/yaml-templates/build-windows.yaml b/build-tools/automation/yaml-templates/build-windows.yaml index a32cba59178..946b0cebf27 100644 --- a/build-tools/automation/yaml-templates/build-windows.yaml +++ b/build-tools/automation/yaml-templates/build-windows.yaml @@ -19,14 +19,15 @@ stages: - job: Test pool: vmImage: 'ubuntu-latest' - container: - image: ubuntu:20.04 + container: c1 steps: - script: printenv + target: c1 - script: | - apt install curl ca-certificates -y + apt-get install curl ca-certificates -y curl https://repo.waydro.id | bash - apt install waydroid -y + apt-get install waydroid -y + target: c1 - stage: ${{ parameters.stageName }} displayName: ${{ parameters.stageDisplayName }} From 86551761153dffe34c1bee28ade3a70ddbba77bf Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 11 Jan 2024 07:38:32 +0000 Subject: [PATCH 10/68] ff --- build-tools/automation/yaml-templates/build-windows.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build-tools/automation/yaml-templates/build-windows.yaml b/build-tools/automation/yaml-templates/build-windows.yaml index 946b0cebf27..b7d1554dcf6 100644 --- a/build-tools/automation/yaml-templates/build-windows.yaml +++ b/build-tools/automation/yaml-templates/build-windows.yaml @@ -11,6 +11,11 @@ parameters: stageName: win_build_test stageDisplayName: Windows +resources: + containers: + - container: c1 + image: ubuntu:20.04 + # This stage ensures Windows specific build steps continue to work, and runs unit tests. stages: - stage: TestContainer From 3217ffe978361068549014eb77b959ec7d077837 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 11 Jan 2024 07:43:59 +0000 Subject: [PATCH 11/68] ff --- build-tools/automation/azure-pipelines.yaml | 3 +++ build-tools/automation/yaml-templates/build-windows.yaml | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index cf06e9233a2..159c6a953e8 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -35,6 +35,9 @@ resources: name: dotnet/maui ref: refs/heads/net9.0 endpoint: xamarin + containers: + - container: c1 + image: ubuntu:20.04 parameters: - name: pushXAPackagesToMaestro diff --git a/build-tools/automation/yaml-templates/build-windows.yaml b/build-tools/automation/yaml-templates/build-windows.yaml index b7d1554dcf6..946b0cebf27 100644 --- a/build-tools/automation/yaml-templates/build-windows.yaml +++ b/build-tools/automation/yaml-templates/build-windows.yaml @@ -11,11 +11,6 @@ parameters: stageName: win_build_test stageDisplayName: Windows -resources: - containers: - - container: c1 - image: ubuntu:20.04 - # This stage ensures Windows specific build steps continue to work, and runs unit tests. stages: - stage: TestContainer From a3b2360d0fc6d7ff7e2ea08361047965dbc9fa78 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 11 Jan 2024 08:06:36 +0000 Subject: [PATCH 12/68] ff --- build-tools/automation/yaml-templates/build-windows.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-tools/automation/yaml-templates/build-windows.yaml b/build-tools/automation/yaml-templates/build-windows.yaml index 946b0cebf27..cf4695d7ffb 100644 --- a/build-tools/automation/yaml-templates/build-windows.yaml +++ b/build-tools/automation/yaml-templates/build-windows.yaml @@ -24,9 +24,9 @@ stages: - script: printenv target: c1 - script: | - apt-get install curl ca-certificates -y - curl https://repo.waydro.id | bash - apt-get install waydroid -y + sudo apt-get install curl ca-certificates -y + curl https://repo.waydro.id | sudo bash + sudo apt-get install waydroid -y target: c1 - stage: ${{ parameters.stageName }} From 5a93c585430f32c106f09be65fc75d96604a1d3c Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 11 Jan 2024 09:42:28 +0000 Subject: [PATCH 13/68] ff --- build-tools/automation/azure-pipelines.yaml | 3 --- .../yaml-templates/build-windows.yaml | 24 +++++++++++++------ 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 159c6a953e8..cf06e9233a2 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -35,9 +35,6 @@ resources: name: dotnet/maui ref: refs/heads/net9.0 endpoint: xamarin - containers: - - container: c1 - image: ubuntu:20.04 parameters: - name: pushXAPackagesToMaestro diff --git a/build-tools/automation/yaml-templates/build-windows.yaml b/build-tools/automation/yaml-templates/build-windows.yaml index cf4695d7ffb..5d59ba6501c 100644 --- a/build-tools/automation/yaml-templates/build-windows.yaml +++ b/build-tools/automation/yaml-templates/build-windows.yaml @@ -19,15 +19,25 @@ stages: - job: Test pool: vmImage: 'ubuntu-latest' - container: c1 + resources: + containers: + - container: emulator + image: ubuntu:20.04 steps: - - script: printenv - target: c1 - script: | - sudo apt-get install curl ca-certificates -y - curl https://repo.waydro.id | sudo bash - sudo apt-get install waydroid -y - target: c1 + echo "I can run inside the container (it starts by default)" + printenv + whoami + target: + container: emulator + - task: Docker@2 + inputs: + command: stop + container: emulator + # - script: | + # sudo apt-get install curl ca-certificates -y + # curl https://repo.waydro.id | sudo bash + # sudo apt-get install waydroid -y - stage: ${{ parameters.stageName }} displayName: ${{ parameters.stageDisplayName }} From 64cc7518c3bd40f9c367a0c2ab304bc2fcef27b4 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 11 Jan 2024 09:44:23 +0000 Subject: [PATCH 14/68] ff --- build-tools/automation/azure-pipelines.yaml | 3 +++ build-tools/automation/yaml-templates/build-windows.yaml | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index cf06e9233a2..45c69b11c30 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -35,6 +35,9 @@ resources: name: dotnet/maui ref: refs/heads/net9.0 endpoint: xamarin + containers: + - container: emulator + image: ubuntu:20.04 parameters: - name: pushXAPackagesToMaestro diff --git a/build-tools/automation/yaml-templates/build-windows.yaml b/build-tools/automation/yaml-templates/build-windows.yaml index 5d59ba6501c..6f03b19489f 100644 --- a/build-tools/automation/yaml-templates/build-windows.yaml +++ b/build-tools/automation/yaml-templates/build-windows.yaml @@ -19,11 +19,11 @@ stages: - job: Test pool: vmImage: 'ubuntu-latest' - resources: - containers: - - container: emulator - image: ubuntu:20.04 steps: + - task: Docker@2 + inputs: + command: start + container: emulator - script: | echo "I can run inside the container (it starts by default)" printenv From 8aa3fdbce00f7518eefd1172bda6d0de95628b43 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 11 Jan 2024 10:09:31 +0000 Subject: [PATCH 15/68] ff --- build-tools/automation/azure-pipelines.yaml | 6 +++--- .../automation/yaml-templates/build-windows.yaml | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 45c69b11c30..0ee5f7ce610 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -35,9 +35,9 @@ resources: name: dotnet/maui ref: refs/heads/net9.0 endpoint: xamarin - containers: - - container: emulator - image: ubuntu:20.04 + containers: + - container: emulator + image: ubuntu:20.04 parameters: - name: pushXAPackagesToMaestro diff --git a/build-tools/automation/yaml-templates/build-windows.yaml b/build-tools/automation/yaml-templates/build-windows.yaml index 6f03b19489f..94ec4d9c52e 100644 --- a/build-tools/automation/yaml-templates/build-windows.yaml +++ b/build-tools/automation/yaml-templates/build-windows.yaml @@ -30,14 +30,16 @@ stages: whoami target: container: emulator + - script: | + sudo apt install curl ca-certificates -y + curl https://repo.waydro.id | sudo bash + sudo apt install waydroid -y + target: + container: emulator - task: Docker@2 inputs: command: stop container: emulator - # - script: | - # sudo apt-get install curl ca-certificates -y - # curl https://repo.waydro.id | sudo bash - # sudo apt-get install waydroid -y - stage: ${{ parameters.stageName }} displayName: ${{ parameters.stageDisplayName }} From b8a0679ace7edda916492b1e260cd9790955fb23 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 11 Jan 2024 11:05:43 +0000 Subject: [PATCH 16/68] ff --- build-tools/automation/yaml-templates/build-windows.yaml | 3 ++- build-tools/scripts/DockerFile | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 build-tools/scripts/DockerFile diff --git a/build-tools/automation/yaml-templates/build-windows.yaml b/build-tools/automation/yaml-templates/build-windows.yaml index 94ec4d9c52e..fae6527fdea 100644 --- a/build-tools/automation/yaml-templates/build-windows.yaml +++ b/build-tools/automation/yaml-templates/build-windows.yaml @@ -23,7 +23,8 @@ stages: - task: Docker@2 inputs: command: start - container: emulator + Dockerfile: build-tools/scripts/DockerFile + container: emulator - script: | echo "I can run inside the container (it starts by default)" printenv diff --git a/build-tools/scripts/DockerFile b/build-tools/scripts/DockerFile new file mode 100644 index 00000000000..9dafe38f523 --- /dev/null +++ b/build-tools/scripts/DockerFile @@ -0,0 +1 @@ +RUN apk add bash sudo shadow \ No newline at end of file From 95650fadbc1f4299e693a19519347450aa273b56 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 11 Jan 2024 11:10:41 +0000 Subject: [PATCH 17/68] ff --- build-tools/automation/azure-pipelines.yaml | 28 ++++++++++++++++++ .../yaml-templates/build-windows.yaml | 29 ------------------- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 0ee5f7ce610..2f3d504db87 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -108,6 +108,34 @@ extends: - template: /build-tools/automation/yaml-templates/build-linux.yaml@self + - stage: TestContainer + displayName: Test Container + jobs: + - job: Test + pool: + vmImage: 'ubuntu-latest' + steps: + - task: Docker@2 + inputs: + command: start + Dockerfile: build-tools/scripts/DockerFile + container: emulator + - script: | + echo "I can run inside the container (it starts by default)" + printenv + whoami + target: + container: emulator + - script: | + sudo apt install curl ca-certificates -y + curl https://repo.waydro.id | sudo bash + sudo apt install waydroid -y + target: + container: emulator + - task: Docker@2 + inputs: + command: stop + container: emulator - stage: smoke_tests displayName: Package Tests dependsOn: mac_build diff --git a/build-tools/automation/yaml-templates/build-windows.yaml b/build-tools/automation/yaml-templates/build-windows.yaml index fae6527fdea..92cbd13ccb7 100644 --- a/build-tools/automation/yaml-templates/build-windows.yaml +++ b/build-tools/automation/yaml-templates/build-windows.yaml @@ -13,35 +13,6 @@ parameters: # This stage ensures Windows specific build steps continue to work, and runs unit tests. stages: -- stage: TestContainer - displayName: Test Container - jobs: - - job: Test - pool: - vmImage: 'ubuntu-latest' - steps: - - task: Docker@2 - inputs: - command: start - Dockerfile: build-tools/scripts/DockerFile - container: emulator - - script: | - echo "I can run inside the container (it starts by default)" - printenv - whoami - target: - container: emulator - - script: | - sudo apt install curl ca-certificates -y - curl https://repo.waydro.id | sudo bash - sudo apt install waydroid -y - target: - container: emulator - - task: Docker@2 - inputs: - command: stop - container: emulator - - stage: ${{ parameters.stageName }} displayName: ${{ parameters.stageDisplayName }} dependsOn: ${{ parameters.dependsOn }} From 78b82246c51e9508a85db5a53577682b4c7a6f9d Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 11 Jan 2024 12:01:58 +0000 Subject: [PATCH 18/68] ff --- build-tools/automation/azure-pipelines.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 2f3d504db87..44d9947835d 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -38,6 +38,7 @@ resources: containers: - container: emulator image: ubuntu:20.04 + options: --user root parameters: - name: pushXAPackagesToMaestro @@ -118,7 +119,6 @@ extends: - task: Docker@2 inputs: command: start - Dockerfile: build-tools/scripts/DockerFile container: emulator - script: | echo "I can run inside the container (it starts by default)" @@ -127,15 +127,16 @@ extends: target: container: emulator - script: | - sudo apt install curl ca-certificates -y - curl https://repo.waydro.id | sudo bash - sudo apt install waydroid -y + apt install curl ca-certificates -y + curl https://repo.waydro.id | bash + apt install waydroid -y target: container: emulator - task: Docker@2 inputs: command: stop container: emulator + - stage: smoke_tests displayName: Package Tests dependsOn: mac_build From 495b84f175e9292bfc60a2d89490694de2eda56e Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 11 Jan 2024 14:15:41 +0000 Subject: [PATCH 19/68] ff --- build-tools/automation/azure-pipelines.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 44d9947835d..46dabb67230 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -35,10 +35,6 @@ resources: name: dotnet/maui ref: refs/heads/net9.0 endpoint: xamarin - containers: - - container: emulator - image: ubuntu:20.04 - options: --user root parameters: - name: pushXAPackagesToMaestro From 2c12fef367fedf22f940a34247c1844149406f9f Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 1 Feb 2024 09:01:55 +0000 Subject: [PATCH 20/68] try adding kernel stuff --- build-tools/automation/azure-pipelines.yaml | 50 ++++++++++++++------- 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 46dabb67230..42a9fceab19 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -112,26 +112,44 @@ extends: pool: vmImage: 'ubuntu-latest' steps: - - task: Docker@2 - inputs: - command: start - container: emulator - script: | - echo "I can run inside the container (it starts by default)" printenv whoami - target: - container: emulator + curl -h + sudo -h + displayName: Display Environment - script: | - apt install curl ca-certificates -y - curl https://repo.waydro.id | bash - apt install waydroid -y - target: - container: emulator - - task: Docker@2 - inputs: - command: stop - container: emulator + sudo apt-get install curl ca-certificates -y + curl https://repo.waydro.id | sudo bash + sudo apt-get install waydroid -y + displayName: Install WayDroid + - script: | + sudo apt install linux-generic -y + sudo apt install --reinstall linux-image-$(uname -r) -y + sudo apt install --reinstall linux-modules-$(uname -r) -y + sudo apt install --reinstall linux-modules-extra-$(uname -r) -y + displayName: Install Kernel Stuff + - script: | + sudo waydroid init -f + displayName: waydroid init -f + - script: | + sudo waydroid init + displayName: waydroid init + - script: | + waydroid log + displayName: waydroid log + - script: | + sudo waydroid container start + waydroid session start + displayName: Start WayDroid + - script: | + waydroid log + adb devices + displayName: Logging + - script: | + waydroid session stop + sudo waydroid container stop + displayName: Stop WayDroid - stage: smoke_tests displayName: Package Tests From 42b39c958b2b40745d6af0a61b724de6403b1d14 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 1 Feb 2024 10:12:53 +0000 Subject: [PATCH 21/68] try adding kernel stuff --- build-tools/automation/azure-pipelines.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 42a9fceab19..1b22aeb55f9 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -135,15 +135,11 @@ extends: - script: | sudo waydroid init displayName: waydroid init - - script: | - waydroid log - displayName: waydroid log - script: | sudo waydroid container start waydroid session start displayName: Start WayDroid - script: | - waydroid log adb devices displayName: Logging - script: | From 0d4d4693c7352e95bfde80e1ee2afa75fd0a930b Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 1 Feb 2024 10:43:34 +0000 Subject: [PATCH 22/68] try adding kernel stuff --- build-tools/automation/azure-pipelines.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 1b22aeb55f9..18de63cf61f 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -136,7 +136,6 @@ extends: sudo waydroid init displayName: waydroid init - script: | - sudo waydroid container start waydroid session start displayName: Start WayDroid - script: | From be99c560af5c8befd5e07cd30030350c4b6fc385 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Tue, 16 Apr 2024 18:41:26 +0100 Subject: [PATCH 23/68] Update to use aosp_atd again --- build-tools/scripts/TestApks.targets | 2 +- .../xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs | 4 ++-- build-tools/xaprepare/xaprepare/Steps/Step_Android_SDK_NDK.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-tools/scripts/TestApks.targets b/build-tools/scripts/TestApks.targets index c7e0417fde6..013670e0058 100644 --- a/build-tools/scripts/TestApks.targets +++ b/build-tools/scripts/TestApks.targets @@ -22,7 +22,7 @@ 33 arm64-v8a x86_64 - default + aosp_atd true false -no-window -no-boot-anim $(TestAvdExtraBootArgs) diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs index 1f299cdb97d..0dc171aa13f 100644 --- a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs +++ b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs @@ -98,8 +98,8 @@ public AndroidToolchain () dependencyType: AndroidToolchainComponentType.EmulatorDependency ), new AndroidToolchainComponent (isArm64Apple ? $"{systemImageArch}-33_r02" : $"{systemImageArch}-33_r02", - destDir: Path.Combine ("system-images", "android-33", "default", systemImageArch), - relativeUrl: new Uri ("sys-img/android/", UriKind.Relative), + destDir: Path.Combine ("system-images", "android-33", "aosp_atd", systemImageArch), + relativeUrl: new Uri ("sys-img/aosp_atd/", UriKind.Relative), pkgRevision: "2", dependencyType: AndroidToolchainComponentType.EmulatorDependency ), diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_Android_SDK_NDK.cs b/build-tools/xaprepare/xaprepare/Steps/Step_Android_SDK_NDK.cs index 5879fcbc703..bdcb1ea68a7 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_Android_SDK_NDK.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_Android_SDK_NDK.cs @@ -269,7 +269,7 @@ void Check (Context context, string packageCacheDir, string sdkRoot, AndroidTool Component = component, PackageName = packageName, Url = GetPackageUrl (component, packageName), - LocalPackagePath = Path.Combine (packageCacheDir, packageName), + LocalPackagePath = Path.Combine (packageCacheDir, component.RelativeUrl.ToString () ?? string.Empty, packageName), DestinationDir = GetDestinationDir (component, sdkRoot), }; From b7e10ad9f2fa46fbd30af0da8775025afe28a7ef Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Tue, 16 Apr 2024 18:47:21 +0100 Subject: [PATCH 24/68] use aops_atd for nightly api 33 --- build-tools/automation/azure-pipelines-nightly.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/automation/azure-pipelines-nightly.yaml b/build-tools/automation/azure-pipelines-nightly.yaml index 8c9c046454b..ec56ec17268 100644 --- a/build-tools/automation/azure-pipelines-nightly.yaml +++ b/build-tools/automation/azure-pipelines-nightly.yaml @@ -114,7 +114,7 @@ stages: Android33-x86_64: avdApiLevel: 33 avdAbi: x86_64 - avdType: default + avdType: aosp_atd pool: vmImage: $(HostedMacImage) workspace: From 8d68868351a21c4e1ed1040396dcbee261d0f09a Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Tue, 16 Apr 2024 19:04:39 +0100 Subject: [PATCH 25/68] fix build error --- build-tools/xaprepare/xaprepare/Steps/Step_Android_SDK_NDK.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_Android_SDK_NDK.cs b/build-tools/xaprepare/xaprepare/Steps/Step_Android_SDK_NDK.cs index bdcb1ea68a7..6b42ee0b514 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_Android_SDK_NDK.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_Android_SDK_NDK.cs @@ -269,7 +269,7 @@ void Check (Context context, string packageCacheDir, string sdkRoot, AndroidTool Component = component, PackageName = packageName, Url = GetPackageUrl (component, packageName), - LocalPackagePath = Path.Combine (packageCacheDir, component.RelativeUrl.ToString () ?? string.Empty, packageName), + LocalPackagePath = Path.Combine (packageCacheDir, component.RelativeUrl?.ToString () ?? string.Empty, packageName), DestinationDir = GetDestinationDir (component, sdkRoot), }; From c21e556f159c69270d9edb59e7e4de33e35585ef Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 17 Apr 2024 14:07:12 +0100 Subject: [PATCH 26/68] update documentation url for aosp_atd images --- .../xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs index 0dc171aa13f..73828cec89d 100644 --- a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs +++ b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs @@ -47,6 +47,7 @@ public AndroidToolchain () // // https://dl-ssl.google.com/android/repository/sys-img/android/sys-img2-1.xml // https://dl-ssl.google.com/android/repository/sys-img/google_apis/sys-img2-1.xml + // https://dl-ssl.google.com/android/repository/sys-img/aosp_atd/sys-img2-1.xml // * system images // Components = new List { From 772fa75685a3db3b58551c78670836c824c07073 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 17 Apr 2024 14:37:14 +0100 Subject: [PATCH 27/68] ff --- .../Xamarin.Android.Build.Tests/Utilities/DeviceTest.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/DeviceTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/DeviceTest.cs index a6dec7fe137..b4fc00aad5e 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/DeviceTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/DeviceTest.cs @@ -56,9 +56,15 @@ public void AssertHasDevices (bool fail = true) [OneTimeSetUp] public void DeviceSetup () { + TestContext.Out.WriteLine ($"LOG DeviceSetup: Enter!!!"); + Console.WriteLine ($"LOG DeviceSetup: Enter Console!!!"); + Console.ReadLine (); + if (!string.IsNullOrEmpty (DeviceAbi)) + return; if (IsDeviceAttached ()) { try { DeviceSdkVersion = GetSdkVersion (); + TestContext.Out.WriteLine ($"LOG DeviceSetup: {DeviceSdkVersion}"); if (DeviceSdkVersion != -1) { if (DeviceSdkVersion >= 21) DeviceAbi = RunAdbCommand ("shell getprop ro.product.cpu.abilist64").Trim (); From 927429a479571bbae44044bd5b8521e386218f6b Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 17 Apr 2024 15:54:52 +0100 Subject: [PATCH 28/68] diagnostics --- .../Tests/Xamarin.Android.Build.Tests/Utilities/DeviceTest.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/DeviceTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/DeviceTest.cs index b4fc00aad5e..77270c74029 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/DeviceTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/DeviceTest.cs @@ -58,7 +58,6 @@ public void DeviceSetup () { TestContext.Out.WriteLine ($"LOG DeviceSetup: Enter!!!"); Console.WriteLine ($"LOG DeviceSetup: Enter Console!!!"); - Console.ReadLine (); if (!string.IsNullOrEmpty (DeviceAbi)) return; if (IsDeviceAttached ()) { From 1d37e7bd0bd451ca883d9c815a7bb4c61a252f4a Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Fri, 19 Apr 2024 14:32:06 +0100 Subject: [PATCH 29/68] use aosp_atd for Nightly builds --- build-tools/automation/azure-pipelines-nightly.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-tools/automation/azure-pipelines-nightly.yaml b/build-tools/automation/azure-pipelines-nightly.yaml index ec56ec17268..92601bd3351 100644 --- a/build-tools/automation/azure-pipelines-nightly.yaml +++ b/build-tools/automation/azure-pipelines-nightly.yaml @@ -106,11 +106,11 @@ stages: Android30-x86_64: avdApiLevel: 30 avdAbi: x86_64 - avdType: default + avdType: aosp_atd Android31-x86_64: avdApiLevel: 31 avdAbi: x86_64 - avdType: default + avdType: aosp_atd Android33-x86_64: avdApiLevel: 33 avdAbi: x86_64 From 7d43e6343791e38799d6cd6c0409790ef9d72cf3 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 26 Jun 2024 13:58:37 +0100 Subject: [PATCH 30/68] use pool --- build-tools/automation/azure-pipelines.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 18de63cf61f..dff4f239742 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -110,7 +110,9 @@ extends: jobs: - job: Test pool: - vmImage: 'ubuntu-latest' + name: MAUI-1ESPT + image: $(LinuxPoolImage1ESPT) + os: linux steps: - script: | printenv From 92e2bc945b264e48e61327d85202b3eb2e0af9c7 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 26 Jun 2024 15:21:13 +0100 Subject: [PATCH 31/68] try this --- build-tools/automation/azure-pipelines.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index dff4f239742..befca8fd019 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -130,14 +130,18 @@ extends: sudo apt install --reinstall linux-image-$(uname -r) -y sudo apt install --reinstall linux-modules-$(uname -r) -y sudo apt install --reinstall linux-modules-extra-$(uname -r) -y + sudo apt install -y dbus-x11 displayName: Install Kernel Stuff - script: | + export $(dbus-launch) sudo waydroid init -f displayName: waydroid init -f - script: | + export $(dbus-launch) sudo waydroid init displayName: waydroid init - script: | + export $(dbus-launch) waydroid session start displayName: Start WayDroid - script: | From ef32d818acb0fce9abb064f206b87782ab6f957e Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 26 Jun 2024 16:07:15 +0100 Subject: [PATCH 32/68] try this --- build-tools/automation/azure-pipelines.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index befca8fd019..1ec68fb860a 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -142,7 +142,11 @@ extends: displayName: waydroid init - script: | export $(dbus-launch) + export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir + mkdir "${XDG_RUNTIME_DIR}" + chmod 0700 "${XDG_RUNTIME_DIR}" waydroid session start + waydroid log displayName: Start WayDroid - script: | adb devices From 07cfc9aee84f6c9692c71b9657d8a3b1d1fc2b5b Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 26 Jun 2024 18:49:16 +0100 Subject: [PATCH 33/68] try this --- build-tools/automation/azure-pipelines.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 1ec68fb860a..08b5452da24 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -146,7 +146,6 @@ extends: mkdir "${XDG_RUNTIME_DIR}" chmod 0700 "${XDG_RUNTIME_DIR}" waydroid session start - waydroid log displayName: Start WayDroid - script: | adb devices From bf948e8b826b50fe779f662908f17cd18d222b42 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 26 Jun 2024 22:38:46 +0100 Subject: [PATCH 34/68] try this --- build-tools/automation/azure-pipelines.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 08b5452da24..2dbf646ecda 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -131,6 +131,7 @@ extends: sudo apt install --reinstall linux-modules-$(uname -r) -y sudo apt install --reinstall linux-modules-extra-$(uname -r) -y sudo apt install -y dbus-x11 + sudo apt install weston displayName: Install Kernel Stuff - script: | export $(dbus-launch) @@ -145,8 +146,19 @@ extends: export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir mkdir "${XDG_RUNTIME_DIR}" chmod 0700 "${XDG_RUNTIME_DIR}" + weston --tty 1 2>&1 | tee /var/log/weston.log & sleep 3 waydroid session start displayName: Start WayDroid + - bash: | + ipAddress=\$(waydroid shell ip addr show eth0 | grep "inet " | awk '{print \$2}' | cut -d/ -f1) + while [ -z "\$ipAddress" ]; do + echo "Waiting for waydroid to start" + sleep 1 + ipAddress=\$(waydroid shell ip addr show eth0 | grep "inet " | awk '{print \$2}' | cut -d/ -f1) + done + echo "Waydroid started with ip address: \$ipAddress" + adb connect \$ipAddress:5555 + displayName: Wait for waydroid - script: | adb devices displayName: Logging From b10940ea3c31f6f5451b14b265293e10fa18218f Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 27 Jun 2024 07:48:30 +0100 Subject: [PATCH 35/68] try this --- build-tools/automation/azure-pipelines.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 2dbf646ecda..bac9eefb1b3 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -146,8 +146,10 @@ extends: export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir mkdir "${XDG_RUNTIME_DIR}" chmod 0700 "${XDG_RUNTIME_DIR}" - weston --tty 1 2>&1 | tee /var/log/weston.log & sleep 3 + weston --tty 1 2>&1 | tee /tmp/weston.log + sleep 3 waydroid session start + sleep 3 displayName: Start WayDroid - bash: | ipAddress=\$(waydroid shell ip addr show eth0 | grep "inet " | awk '{print \$2}' | cut -d/ -f1) From 5d6f56ff153b017fe66555f13da519d558dd7492 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 27 Jun 2024 08:34:08 +0100 Subject: [PATCH 36/68] try this --- build-tools/automation/azure-pipelines.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index bac9eefb1b3..cf95ceb9c9e 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -146,20 +146,20 @@ extends: export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir mkdir "${XDG_RUNTIME_DIR}" chmod 0700 "${XDG_RUNTIME_DIR}" - weston --tty 1 2>&1 | tee /tmp/weston.log + weston-launch --tty 1 2>&1 | tee /tmp/weston.log sleep 3 waydroid session start sleep 3 displayName: Start WayDroid - bash: | - ipAddress=\$(waydroid shell ip addr show eth0 | grep "inet " | awk '{print \$2}' | cut -d/ -f1) - while [ -z "\$ipAddress" ]; do + ipAddress=$(waydroid shell ip addr show eth0 | grep "inet " | awk '{print $2}' | cut -d/ -f1) + while [ -z "$ipAddress" ]; do echo "Waiting for waydroid to start" sleep 1 - ipAddress=\$(waydroid shell ip addr show eth0 | grep "inet " | awk '{print \$2}' | cut -d/ -f1) + ipAddress=$(waydroid shell ip addr show eth0 | grep "inet " | awk '{print $2}' | cut -d/ -f1) done - echo "Waydroid started with ip address: \$ipAddress" - adb connect \$ipAddress:5555 + echo "Waydroid started with ip address: $ipAddress" + adb connect $ipAddress:5555 displayName: Wait for waydroid - script: | adb devices From 9fcf34f0652b46fe6583a2879987ddb4537c16be Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 27 Jun 2024 09:13:22 +0100 Subject: [PATCH 37/68] try this --- build-tools/automation/azure-pipelines.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index cf95ceb9c9e..c965ee6484a 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -132,6 +132,7 @@ extends: sudo apt install --reinstall linux-modules-extra-$(uname -r) -y sudo apt install -y dbus-x11 sudo apt install weston + sudo apt install xvfb displayName: Install Kernel Stuff - script: | export $(dbus-launch) @@ -146,7 +147,7 @@ extends: export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir mkdir "${XDG_RUNTIME_DIR}" chmod 0700 "${XDG_RUNTIME_DIR}" - weston-launch --tty 1 2>&1 | tee /tmp/weston.log + xvfb-run weston -B headless-backend.so -width=1024 -height=768 sleep 3 waydroid session start sleep 3 From 6e5cdbab44834c060db6e74e3bb6a53feeafed88 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 27 Jun 2024 11:45:31 +0100 Subject: [PATCH 38/68] try this --- build-tools/automation/azure-pipelines.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index c965ee6484a..1dfa76373f6 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -147,7 +147,7 @@ extends: export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir mkdir "${XDG_RUNTIME_DIR}" chmod 0700 "${XDG_RUNTIME_DIR}" - xvfb-run weston -B headless-backend.so -width=1024 -height=768 + xvfb-run weston -B headless-backend.so --width=1024 --height=768 --xwayland sleep 3 waydroid session start sleep 3 From d066e6f9f106dd63575139f4fa25ab0054cd0cda Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 27 Jun 2024 12:58:46 +0100 Subject: [PATCH 39/68] try this --- build-tools/automation/azure-pipelines.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 1dfa76373f6..1f998fa1a09 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -147,7 +147,7 @@ extends: export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir mkdir "${XDG_RUNTIME_DIR}" chmod 0700 "${XDG_RUNTIME_DIR}" - xvfb-run weston -B headless-backend.so --width=1024 --height=768 --xwayland + xvfb-run weston -B headless-backend.so --width=1024 --height=768 --xwayland & sleep 3 waydroid session start sleep 3 From c034dca4436b7d07ac99b4873c757b45c6e59b9e Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 27 Jun 2024 13:38:40 +0100 Subject: [PATCH 40/68] try this --- build-tools/automation/azure-pipelines.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 1f998fa1a09..df3aa05f053 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -149,7 +149,7 @@ extends: chmod 0700 "${XDG_RUNTIME_DIR}" xvfb-run weston -B headless-backend.so --width=1024 --height=768 --xwayland & sleep 3 - waydroid session start + waydroid session start & sleep 3 displayName: Start WayDroid - bash: | From 543d4fe1b7454b004105e1fcf8f3c6d85d60d8e8 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 27 Jun 2024 14:17:20 +0100 Subject: [PATCH 41/68] try this --- build-tools/automation/azure-pipelines.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index df3aa05f053..81e8e137227 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -153,11 +153,11 @@ extends: sleep 3 displayName: Start WayDroid - bash: | - ipAddress=$(waydroid shell ip addr show eth0 | grep "inet " | awk '{print $2}' | cut -d/ -f1) + ipAddress=$(sudo waydroid shell ip addr show eth0 | grep "inet " | awk '{print $2}' | cut -d/ -f1) while [ -z "$ipAddress" ]; do echo "Waiting for waydroid to start" sleep 1 - ipAddress=$(waydroid shell ip addr show eth0 | grep "inet " | awk '{print $2}' | cut -d/ -f1) + ipAddress=$(sudo waydroid shell ip addr show eth0 | grep "inet " | awk '{print $2}' | cut -d/ -f1) done echo "Waydroid started with ip address: $ipAddress" adb connect $ipAddress:5555 From c3a43d1d29aa9c4ce20176cbd5a8a766d61a97b9 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 27 Jun 2024 14:21:46 +0100 Subject: [PATCH 42/68] try this --- build-tools/automation/azure-pipelines.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 81e8e137227..d9c9e677279 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -154,10 +154,15 @@ extends: displayName: Start WayDroid - bash: | ipAddress=$(sudo waydroid shell ip addr show eth0 | grep "inet " | awk '{print $2}' | cut -d/ -f1) + done=0 while [ -z "$ipAddress" ]; do + if [ $done == '180' ]; then + break + fi echo "Waiting for waydroid to start" sleep 1 ipAddress=$(sudo waydroid shell ip addr show eth0 | grep "inet " | awk '{print $2}' | cut -d/ -f1) + ((done++)) done echo "Waydroid started with ip address: $ipAddress" adb connect $ipAddress:5555 From 47b338160e0918e42c7776a2770825e8d8685a24 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 27 Jun 2024 15:01:35 +0100 Subject: [PATCH 43/68] try this --- build-tools/automation/azure-pipelines.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index d9c9e677279..ae8efe55d00 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -149,6 +149,8 @@ extends: chmod 0700 "${XDG_RUNTIME_DIR}" xvfb-run weston -B headless-backend.so --width=1024 --height=768 --xwayland & sleep 3 + sudo waydroid container start + sleep 3 waydroid session start & sleep 3 displayName: Start WayDroid From de2f163f9a95f0c459706804301c3aafa08fd159 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 27 Jun 2024 16:36:47 +0100 Subject: [PATCH 44/68] try this --- build-tools/automation/azure-pipelines.yaml | 26 +++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index ae8efe55d00..348da98b813 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -136,25 +136,36 @@ extends: displayName: Install Kernel Stuff - script: | export $(dbus-launch) + export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir + mkdir "${XDG_RUNTIME_DIR}" + chmod 0700 "${XDG_RUNTIME_DIR}" sudo waydroid init -f displayName: waydroid init -f - script: | export $(dbus-launch) + export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir sudo waydroid init displayName: waydroid init - script: | export $(dbus-launch) export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir - mkdir "${XDG_RUNTIME_DIR}" - chmod 0700 "${XDG_RUNTIME_DIR}" xvfb-run weston -B headless-backend.so --width=1024 --height=768 --xwayland & - sleep 3 - sudo waydroid container start - sleep 3 + sleep 10 + displayName: Start Weston + - script: | + export $(dbus-launch) + export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir + sudo waydroid container start & + sleep 10 + displayName: Start Container + - script: | + export $(dbus-launch) + export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir waydroid session start & - sleep 3 - displayName: Start WayDroid + sleep 10 + displayName: Start waydroid - bash: | + export PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools" ipAddress=$(sudo waydroid shell ip addr show eth0 | grep "inet " | awk '{print $2}' | cut -d/ -f1) done=0 while [ -z "$ipAddress" ]; do @@ -170,6 +181,7 @@ extends: adb connect $ipAddress:5555 displayName: Wait for waydroid - script: | + export PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools" adb devices displayName: Logging - script: | From c51ea0e089c878f714ca56ed51fd15e693f113bc Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 27 Jun 2024 17:06:06 +0100 Subject: [PATCH 45/68] try this --- build-tools/automation/azure-pipelines.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 348da98b813..3efbbb98b23 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -165,7 +165,7 @@ extends: sleep 10 displayName: Start waydroid - bash: | - export PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools" + export PATH="$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools" ipAddress=$(sudo waydroid shell ip addr show eth0 | grep "inet " | awk '{print $2}' | cut -d/ -f1) done=0 while [ -z "$ipAddress" ]; do From 2d90438e7d4da87ae6436f4d7d787c2e719dba7b Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 27 Jun 2024 17:43:33 +0100 Subject: [PATCH 46/68] try this --- build-tools/automation/azure-pipelines.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 3efbbb98b23..1b822673c53 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -165,7 +165,7 @@ extends: sleep 10 displayName: Start waydroid - bash: | - export PATH="$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools" + export PATH="$PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$ANDROID_SDK_ROOT/platform-tools" ipAddress=$(sudo waydroid shell ip addr show eth0 | grep "inet " | awk '{print $2}' | cut -d/ -f1) done=0 while [ -z "$ipAddress" ]; do @@ -178,6 +178,8 @@ extends: ((done++)) done echo "Waydroid started with ip address: $ipAddress" + echo $ANDROID_SDK_ROOT + echo $PATH adb connect $ipAddress:5555 displayName: Wait for waydroid - script: | From 2bfeb45ee4284a98306536a967898a6d07fb40d2 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 27 Jun 2024 18:44:45 +0100 Subject: [PATCH 47/68] try this --- build-tools/automation/azure-pipelines.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 1b822673c53..1dedd1288f5 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -165,7 +165,6 @@ extends: sleep 10 displayName: Start waydroid - bash: | - export PATH="$PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$ANDROID_SDK_ROOT/platform-tools" ipAddress=$(sudo waydroid shell ip addr show eth0 | grep "inet " | awk '{print $2}' | cut -d/ -f1) done=0 while [ -z "$ipAddress" ]; do @@ -180,11 +179,10 @@ extends: echo "Waydroid started with ip address: $ipAddress" echo $ANDROID_SDK_ROOT echo $PATH - adb connect $ipAddress:5555 + $ANDROID_HOME/platform-tools/adb connect $ipAddress:5555 displayName: Wait for waydroid - script: | - export PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools" - adb devices + $ANDROID_HOME/platform-tools/adb devices displayName: Logging - script: | waydroid session stop From b59f5396b0cffc3f79557393c25559516e5fb4b0 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 27 Jun 2024 20:13:19 +0100 Subject: [PATCH 48/68] try this --- build-tools/automation/azure-pipelines.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 1dedd1288f5..f7cc973dc50 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -119,6 +119,7 @@ extends: whoami curl -h sudo -h + find $ANDROID_SDK_ROOT displayName: Display Environment - script: | sudo apt-get install curl ca-certificates -y From 83df7b7f9b6095164881f575c8504899768b1be1 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 27 Jun 2024 22:18:30 +0100 Subject: [PATCH 49/68] try this --- build-tools/automation/azure-pipelines.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index f7cc973dc50..8f28d906392 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -121,6 +121,9 @@ extends: sudo -h find $ANDROID_SDK_ROOT displayName: Display Environment + - script: | + $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --install "platform-tools" + displayName: Install platfom-tools - script: | sudo apt-get install curl ca-certificates -y curl https://repo.waydro.id | sudo bash From 10c2bcaef8dffc66269bfbbdea3edd7b5efd5df2 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 27 Jun 2024 22:54:45 +0100 Subject: [PATCH 50/68] try this --- build-tools/automation/azure-pipelines.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 8f28d906392..ea6a8effbea 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -187,6 +187,10 @@ extends: displayName: Wait for waydroid - script: | $ANDROID_HOME/platform-tools/adb devices + $ANDROID_HOME/platform-tools/adb getprop + $ANDROID_HOME/platform-tools/adb shell screencap /data/local/tmp/screenshot.png + $ANDROID_HOME/platform-tools/adb pull /data/local/tmp/screenshot.png screenshot.png + $ANDROID_HOME/platform-tools/adb exec-out uiautomator dump /dev/tty displayName: Logging - script: | waydroid session stop From 9a1c5b89e21e89fb8e42b8b574715f4943cc1b32 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Fri, 28 Jun 2024 01:14:51 +0100 Subject: [PATCH 51/68] try this --- build-tools/automation/azure-pipelines.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index ea6a8effbea..0a05a81dd99 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -187,9 +187,9 @@ extends: displayName: Wait for waydroid - script: | $ANDROID_HOME/platform-tools/adb devices - $ANDROID_HOME/platform-tools/adb getprop + $ANDROID_HOME/platform-tools/adb shell getprop $ANDROID_HOME/platform-tools/adb shell screencap /data/local/tmp/screenshot.png - $ANDROID_HOME/platform-tools/adb pull /data/local/tmp/screenshot.png screenshot.png + $ANDROID_HOME/platform-tools/adb pull /data/local/tmp/screenshot.png $(Build.StagingDirectory)/screenshot.png $ANDROID_HOME/platform-tools/adb exec-out uiautomator dump /dev/tty displayName: Logging - script: | From fbea3ddb96f5ace34577bc34bafe64659e73cf5b Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Fri, 28 Jun 2024 07:44:49 +0100 Subject: [PATCH 52/68] try this --- build-tools/automation/azure-pipelines.yaml | 24 ++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 0a05a81dd99..9e3d2a8ed42 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -138,6 +138,9 @@ extends: sudo apt install weston sudo apt install xvfb displayName: Install Kernel Stuff + - template: /build-tools/automation/yaml-templates/use-dot-net.yaml + parameters: + remove_dotnet: true - script: | export $(dbus-launch) export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir @@ -190,12 +193,31 @@ extends: $ANDROID_HOME/platform-tools/adb shell getprop $ANDROID_HOME/platform-tools/adb shell screencap /data/local/tmp/screenshot.png $ANDROID_HOME/platform-tools/adb pull /data/local/tmp/screenshot.png $(Build.StagingDirectory)/screenshot.png - $ANDROID_HOME/platform-tools/adb exec-out uiautomator dump /dev/tty + $ANDROID_HOME/platform-tools/adb exec-out uiautomator dump /dev/tty > $(Build.StagingDirectory)/ui.xml displayName: Logging + - task: DotNetCoreCLI@2 + displayName: Create New Test Project + inputs: + command: "custom" + custom: "new" + arguments: 'android' + workingDirectory: $(Build.StagingDirectory)/foo + - task: DotNetCoreCLI@2 + displayName: CreateBuild + inputs: + command: "build" + arguments: '-t:Install -bl' + workingDirectory: $(Build.StagingDirectory)/foo - script: | waydroid session stop sudo waydroid container stop displayName: Stop WayDroid + - template: /build-tools/automation/yaml-templates/publish-artifact.yaml@self + parameters: + displayName: upload container tests + artifactName: Test Results - Container + targetPath: $(Build.StagingDirectory) + condition: or(ne(variables['Agent.JobStatus'], 'Succeeded'), eq(variables['XA.PublishAllLogs'], 'true')) - stage: smoke_tests displayName: Package Tests From a85a5476e47e5f12f71c4b13778f3b412117c84b Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Fri, 28 Jun 2024 07:50:24 +0100 Subject: [PATCH 53/68] try this --- build-tools/automation/azure-pipelines.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 9e3d2a8ed42..fa202a8c96f 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -138,9 +138,6 @@ extends: sudo apt install weston sudo apt install xvfb displayName: Install Kernel Stuff - - template: /build-tools/automation/yaml-templates/use-dot-net.yaml - parameters: - remove_dotnet: true - script: | export $(dbus-launch) export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir From a91f5c127a30632a59ceb9451fb4de1dcb3b26c6 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Fri, 28 Jun 2024 12:05:40 +0100 Subject: [PATCH 54/68] try this --- build-tools/automation/azure-pipelines.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index fa202a8c96f..e4e34d11a0d 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -113,6 +113,9 @@ extends: name: MAUI-1ESPT image: $(LinuxPoolImage1ESPT) os: linux + timeoutInMinutes: 180 + workspace: + clean: all steps: - script: | printenv @@ -124,6 +127,8 @@ extends: - script: | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --install "platform-tools" displayName: Install platfom-tools + - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml + - script: | sudo apt-get install curl ca-certificates -y curl https://repo.waydro.id | sudo bash From 5f8595d48c1215b87fa2d231a10e87c06ce12d82 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Fri, 28 Jun 2024 12:09:19 +0100 Subject: [PATCH 55/68] try this --- build-tools/automation/azure-pipelines.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index e4e34d11a0d..07582ac7d79 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -127,7 +127,7 @@ extends: - script: | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --install "platform-tools" displayName: Install platfom-tools - - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml + - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml@self - script: | sudo apt-get install curl ca-certificates -y From 55cd76294681e198e1711fb5dde02d33744c781f Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Fri, 28 Jun 2024 13:16:26 +0100 Subject: [PATCH 56/68] try this --- build-tools/automation/azure-pipelines.yaml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 07582ac7d79..035a731960e 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -197,19 +197,14 @@ extends: $ANDROID_HOME/platform-tools/adb pull /data/local/tmp/screenshot.png $(Build.StagingDirectory)/screenshot.png $ANDROID_HOME/platform-tools/adb exec-out uiautomator dump /dev/tty > $(Build.StagingDirectory)/ui.xml displayName: Logging - - task: DotNetCoreCLI@2 - displayName: Create New Test Project - inputs: - command: "custom" - custom: "new" - arguments: 'android' - workingDirectory: $(Build.StagingDirectory)/foo - - task: DotNetCoreCLI@2 - displayName: CreateBuild - inputs: - command: "build" - arguments: '-t:Install -bl' - workingDirectory: $(Build.StagingDirectory)/foo + - template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml@self + parameters: + project: samples/HelloWorld/HelloWorld/HelloWorld.DotNet.csproj + arguments: >- + -t:Install -c Debug -tl:off -v:diag + -p:DotNetPreviewTool=$(System.DefaultWorkingDirectory)/bin/$(XA.Build.Configuration)/dotnet/dotnet + displayName: Test Install + continueOnError: false - script: | waydroid session stop sudo waydroid container stop From 16d898c4675305590ef07606c03e042eff97e761 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Fri, 28 Jun 2024 13:37:29 +0100 Subject: [PATCH 57/68] add a Docker file and test it under windows --- Dockerfile | 16 ++++++++++++++++ build-tools/automation/azure-pipelines.yaml | 18 ++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000000..aa65e595051 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,16 @@ +FROM ubuntu:impish + +ARG DEBIAN_FRONTEND=noninteractive + +RUN set -ex \ + && sed -i -- 's/# deb-src/deb-src/g' /etc/apt/sources.list \ + && apt-get update \ + && apt-get install -y \ + build-essential \ + cdbs \ + devscripts \ + equivs \ + fakeroot \ + && apt-get install curl ca-certificates -y \ + && curl https://repo.waydro.id | bash \ + && apt-get install waydroid -y \ No newline at end of file diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 035a731960e..36ac6239b93 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -105,6 +105,24 @@ extends: - template: /build-tools/automation/yaml-templates/build-linux.yaml@self + - stage: TestDocker + displayName: Test Container + jobs: + - job: Test + pool: + name: MAUI-1ESPT + image: $(WindowsPoolImage1ESPT) + os: windows + timeoutInMinutes: 180 + workspace: + clean: all + steps: + - task: Docker@2 + displayName: Build image + inputs: + command: build + dockerfile: DockerFile + - stage: TestContainer displayName: Test Container jobs: From e388dfe01049206198e1185e19f57de0496a7eb9 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Fri, 28 Jun 2024 15:11:40 +0100 Subject: [PATCH 58/68] try this --- build-tools/automation/azure-pipelines.yaml | 22 ++++----------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 36ac6239b93..8de1fbbb60f 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -105,24 +105,6 @@ extends: - template: /build-tools/automation/yaml-templates/build-linux.yaml@self - - stage: TestDocker - displayName: Test Container - jobs: - - job: Test - pool: - name: MAUI-1ESPT - image: $(WindowsPoolImage1ESPT) - os: windows - timeoutInMinutes: 180 - workspace: - clean: all - steps: - - task: Docker@2 - displayName: Build image - inputs: - command: build - dockerfile: DockerFile - - stage: TestContainer displayName: Test Container jobs: @@ -215,6 +197,10 @@ extends: $ANDROID_HOME/platform-tools/adb pull /data/local/tmp/screenshot.png $(Build.StagingDirectory)/screenshot.png $ANDROID_HOME/platform-tools/adb exec-out uiautomator dump /dev/tty > $(Build.StagingDirectory)/ui.xml displayName: Logging + - script: | + $ANDROID_HOME/platform-tools/adb root + $ANDROID_HOME/platform-tools/adb shell settings put global development_settings_enabled 1 + displayName: adb developer mode - template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml@self parameters: project: samples/HelloWorld/HelloWorld/HelloWorld.DotNet.csproj From ca9c735cf452d09526660769d7b2db144e8aa576 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Fri, 28 Jun 2024 16:21:57 +0100 Subject: [PATCH 59/68] try this --- build-tools/automation/azure-pipelines.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 8de1fbbb60f..e18170c61ab 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -198,7 +198,6 @@ extends: $ANDROID_HOME/platform-tools/adb exec-out uiautomator dump /dev/tty > $(Build.StagingDirectory)/ui.xml displayName: Logging - script: | - $ANDROID_HOME/platform-tools/adb root $ANDROID_HOME/platform-tools/adb shell settings put global development_settings_enabled 1 displayName: adb developer mode - template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml@self From b5574f429f6851da5bf61f50145c777ea46bc245 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Fri, 28 Jun 2024 17:10:37 +0100 Subject: [PATCH 60/68] try this --- Dockerfile | 16 ---------------- build-tools/automation/azure-pipelines.yaml | 9 ++++++++- 2 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index aa65e595051..00000000000 --- a/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM ubuntu:impish - -ARG DEBIAN_FRONTEND=noninteractive - -RUN set -ex \ - && sed -i -- 's/# deb-src/deb-src/g' /etc/apt/sources.list \ - && apt-get update \ - && apt-get install -y \ - build-essential \ - cdbs \ - devscripts \ - equivs \ - fakeroot \ - && apt-get install curl ca-certificates -y \ - && curl https://repo.waydro.id | bash \ - && apt-get install waydroid -y \ No newline at end of file diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index e18170c61ab..3c9d1f16331 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -207,7 +207,14 @@ extends: -t:Install -c Debug -tl:off -v:diag -p:DotNetPreviewTool=$(System.DefaultWorkingDirectory)/bin/$(XA.Build.Configuration)/dotnet/dotnet displayName: Test Install - continueOnError: false + continueOnError: true + - script: | + waydroid --version + uname --kernel-release + cp /var/lib/waydroid/waydroid* $(Build.StagingDirectory)/ + sudo waydroid shell -- logcat -d | tee $(Build.StagingDirectory)/logcat.txt + sudo dmesg | tee $(Build.StagingDirectory)/dmesg.txt + displayName: Diagnostics - script: | waydroid session stop sudo waydroid container stop From c3b7a116a01d49875dc7f85b049047ea78c65e53 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Mon, 1 Jul 2024 09:27:02 +0100 Subject: [PATCH 61/68] ff --- build-tools/automation/azure-pipelines.yaml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 3c9d1f16331..2722e16c890 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -186,8 +186,6 @@ extends: ((done++)) done echo "Waydroid started with ip address: $ipAddress" - echo $ANDROID_SDK_ROOT - echo $PATH $ANDROID_HOME/platform-tools/adb connect $ipAddress:5555 displayName: Wait for waydroid - script: | @@ -204,16 +202,26 @@ extends: parameters: project: samples/HelloWorld/HelloWorld/HelloWorld.DotNet.csproj arguments: >- - -t:Install -c Debug -tl:off -v:diag + -t:Install -c Release -tl:off -v:diag -p:DotNetPreviewTool=$(System.DefaultWorkingDirectory)/bin/$(XA.Build.Configuration)/dotnet/dotnet displayName: Test Install continueOnError: true + - template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml@self + parameters: + project: samples/HelloWorld/HelloWorld/HelloWorld.DotNet.csproj + arguments: >- + -t:Run -c Release -tl:off -v:diag + -p:DotNetPreviewTool=$(System.DefaultWorkingDirectory)/bin/$(XA.Build.Configuration)/dotnet/dotnet + displayName: Test Run + continueOnError: true - script: | waydroid --version uname --kernel-release cp /var/lib/waydroid/waydroid* $(Build.StagingDirectory)/ sudo waydroid shell -- logcat -d | tee $(Build.StagingDirectory)/logcat.txt sudo dmesg | tee $(Build.StagingDirectory)/dmesg.txt + $ANDROID_HOME/platform-tools/adb shell screencap /data/local/tmp/screenshot1.png + $ANDROID_HOME/platform-tools/adb pull /data/local/tmp/screenshot1.png $(Build.StagingDirectory)/screenshot1.png displayName: Diagnostics - script: | waydroid session stop From 365f6ff5290e6a2098be2808b15ab640539b79d2 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Mon, 1 Jul 2024 10:22:06 +0100 Subject: [PATCH 62/68] ff --- build-tools/automation/azure-pipelines.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 2722e16c890..4deabab9a85 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -215,11 +215,6 @@ extends: displayName: Test Run continueOnError: true - script: | - waydroid --version - uname --kernel-release - cp /var/lib/waydroid/waydroid* $(Build.StagingDirectory)/ - sudo waydroid shell -- logcat -d | tee $(Build.StagingDirectory)/logcat.txt - sudo dmesg | tee $(Build.StagingDirectory)/dmesg.txt $ANDROID_HOME/platform-tools/adb shell screencap /data/local/tmp/screenshot1.png $ANDROID_HOME/platform-tools/adb pull /data/local/tmp/screenshot1.png $(Build.StagingDirectory)/screenshot1.png displayName: Diagnostics From 7bb648e2aeb6644f280d05cd67e3fa10bb0c638d Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Mon, 1 Jul 2024 14:20:42 +0100 Subject: [PATCH 63/68] ff --- build-tools/automation/azure-pipelines.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 4deabab9a85..87cc70caa82 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -217,7 +217,7 @@ extends: - script: | $ANDROID_HOME/platform-tools/adb shell screencap /data/local/tmp/screenshot1.png $ANDROID_HOME/platform-tools/adb pull /data/local/tmp/screenshot1.png $(Build.StagingDirectory)/screenshot1.png - displayName: Diagnostics + displayName: Capture Output - script: | waydroid session stop sudo waydroid container stop From 19626506184bacfcec6c8a5e436f78e99e6a0ddf Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Mon, 1 Jul 2024 15:50:51 +0100 Subject: [PATCH 64/68] ff --- build-tools/automation/azure-pipelines.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 87cc70caa82..f7c1cfafbe2 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -122,7 +122,8 @@ extends: whoami curl -h sudo -h - find $ANDROID_SDK_ROOT + grep -c -w "vmx\|svm" /proc/cpuinfo + find /dev -name kvm displayName: Display Environment - script: | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --install "platform-tools" From bed6c1dce7f92c516c3f249ed8ea440867c304d3 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Tue, 2 Jul 2024 08:43:46 +0100 Subject: [PATCH 65/68] ff --- build-tools/automation/azure-pipelines.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index f7c1cfafbe2..c3f24b23471 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -196,9 +196,9 @@ extends: $ANDROID_HOME/platform-tools/adb pull /data/local/tmp/screenshot.png $(Build.StagingDirectory)/screenshot.png $ANDROID_HOME/platform-tools/adb exec-out uiautomator dump /dev/tty > $(Build.StagingDirectory)/ui.xml displayName: Logging - - script: | - $ANDROID_HOME/platform-tools/adb shell settings put global development_settings_enabled 1 - displayName: adb developer mode + #- script: | + # $ANDROID_HOME/platform-tools/adb shell settings put global development_settings_enabled 1 + # displayName: adb developer mode - template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml@self parameters: project: samples/HelloWorld/HelloWorld/HelloWorld.DotNet.csproj @@ -216,6 +216,7 @@ extends: displayName: Test Run continueOnError: true - script: | + $ANDROID_HOME/platform-tools/adb devices $ANDROID_HOME/platform-tools/adb shell screencap /data/local/tmp/screenshot1.png $ANDROID_HOME/platform-tools/adb pull /data/local/tmp/screenshot1.png $(Build.StagingDirectory)/screenshot1.png displayName: Capture Output From 07a4c954bcbfe4b3440de11611b810d6f90c38b2 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Tue, 2 Jul 2024 09:56:58 +0100 Subject: [PATCH 66/68] ff --- build-tools/automation/azure-pipelines.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index c3f24b23471..bdae1fd5fb4 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -217,8 +217,8 @@ extends: continueOnError: true - script: | $ANDROID_HOME/platform-tools/adb devices - $ANDROID_HOME/platform-tools/adb shell screencap /data/local/tmp/screenshot1.png - $ANDROID_HOME/platform-tools/adb pull /data/local/tmp/screenshot1.png $(Build.StagingDirectory)/screenshot1.png + $ANDROID_HOME/platform-tools/adb shell screencap /data/local/tmp/screenshot.png + $ANDROID_HOME/platform-tools/adb pull /data/local/tmp/screenshot.png $(Build.StagingDirectory)/screenshot1.png displayName: Capture Output - script: | waydroid session stop From f3bfeaa337b76d1fee17fedcf293d6fafe7a77a9 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Tue, 2 Jul 2024 13:42:13 +0100 Subject: [PATCH 67/68] ff --- build-tools/automation/azure-pipelines.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index bdae1fd5fb4..804038f7005 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -191,10 +191,10 @@ extends: displayName: Wait for waydroid - script: | $ANDROID_HOME/platform-tools/adb devices - $ANDROID_HOME/platform-tools/adb shell getprop - $ANDROID_HOME/platform-tools/adb shell screencap /data/local/tmp/screenshot.png - $ANDROID_HOME/platform-tools/adb pull /data/local/tmp/screenshot.png $(Build.StagingDirectory)/screenshot.png - $ANDROID_HOME/platform-tools/adb exec-out uiautomator dump /dev/tty > $(Build.StagingDirectory)/ui.xml + # $ANDROID_HOME/platform-tools/adb shell getprop + # $ANDROID_HOME/platform-tools/adb shell screencap /data/local/tmp/screenshot.png + # $ANDROID_HOME/platform-tools/adb pull /data/local/tmp/screenshot.png $(Build.StagingDirectory)/screenshot.png + # $ANDROID_HOME/platform-tools/adb exec-out uiautomator dump /dev/tty > $(Build.StagingDirectory)/ui.xml displayName: Logging #- script: | # $ANDROID_HOME/platform-tools/adb shell settings put global development_settings_enabled 1 @@ -217,8 +217,8 @@ extends: continueOnError: true - script: | $ANDROID_HOME/platform-tools/adb devices - $ANDROID_HOME/platform-tools/adb shell screencap /data/local/tmp/screenshot.png - $ANDROID_HOME/platform-tools/adb pull /data/local/tmp/screenshot.png $(Build.StagingDirectory)/screenshot1.png + # $ANDROID_HOME/platform-tools/adb shell screencap /data/local/tmp/screenshot.png + # $ANDROID_HOME/platform-tools/adb pull /data/local/tmp/screenshot.png $(Build.StagingDirectory)/screenshot1.png displayName: Capture Output - script: | waydroid session stop From 27782c7c6503a964de9c268976c4130111dab162 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Tue, 2 Jul 2024 14:34:09 +0100 Subject: [PATCH 68/68] ff --- build-tools/automation/azure-pipelines.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 804038f7005..1b6c5eec484 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -217,9 +217,13 @@ extends: continueOnError: true - script: | $ANDROID_HOME/platform-tools/adb devices - # $ANDROID_HOME/platform-tools/adb shell screencap /data/local/tmp/screenshot.png - # $ANDROID_HOME/platform-tools/adb pull /data/local/tmp/screenshot.png $(Build.StagingDirectory)/screenshot1.png displayName: Capture Output + - script: | + $ANDROID_HOME/platform-tools/adb shell screencap /data/local/tmp/screenshot.png + displayName: Capture Screenshot + - script: | + $ANDROID_HOME/platform-tools/adb pull /data/local/tmp/screenshot.png $(Build.StagingDirectory)/screenshot1.png + displayName: copy screen shot - script: | waydroid session stop sudo waydroid container stop @@ -229,7 +233,7 @@ extends: displayName: upload container tests artifactName: Test Results - Container targetPath: $(Build.StagingDirectory) - condition: or(ne(variables['Agent.JobStatus'], 'Succeeded'), eq(variables['XA.PublishAllLogs'], 'true')) + #condition: or(ne(variables['Agent.JobStatus'], 'Succeeded'), eq(variables['XA.PublishAllLogs'], 'true')) - stage: smoke_tests displayName: Package Tests