From 59d7e87298a859991cda2992bcddb56863c49b13 Mon Sep 17 00:00:00 2001 From: Rafael Guterres Jeffman Date: Tue, 22 Oct 2024 10:40:25 -0300 Subject: [PATCH] fixup! upstream CI: Use start.sh script and environment template --- infra/azure/azure-pipelines.yml | 2 +- infra/azure/build-containers.yml | 2 +- infra/azure/nightly.yml | 2 +- infra/azure/pr-pipeline.yml | 2 +- infra/image/build.sh | 3 +-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/infra/azure/azure-pipelines.yml b/infra/azure/azure-pipelines.yml index 4cd2419920..72e4a90d25 100644 --- a/infra/azure/azure-pipelines.yml +++ b/infra/azure/azure-pipelines.yml @@ -3,7 +3,7 @@ trigger: - master pool: - vmImage: 'ubuntu-22.04' + vmImage: 'ubuntu-20.04' stages: diff --git a/infra/azure/build-containers.yml b/infra/azure/build-containers.yml index d4b6b25abd..3ee382b39a 100644 --- a/infra/azure/build-containers.yml +++ b/infra/azure/build-containers.yml @@ -11,7 +11,7 @@ schedules: trigger: none pool: - vmImage: 'ubuntu-22.04' + vmImage: 'ubuntu-20.04' stages: diff --git a/infra/azure/nightly.yml b/infra/azure/nightly.yml index a76c6c0330..eeed7fa58f 100644 --- a/infra/azure/nightly.yml +++ b/infra/azure/nightly.yml @@ -10,7 +10,7 @@ schedules: trigger: none pool: - vmImage: 'ubuntu-22.04' + vmImage: 'ubuntu-20.04' stages: diff --git a/infra/azure/pr-pipeline.yml b/infra/azure/pr-pipeline.yml index a590844a6e..29ff8af301 100644 --- a/infra/azure/pr-pipeline.yml +++ b/infra/azure/pr-pipeline.yml @@ -3,7 +3,7 @@ trigger: - master pool: - vmImage: 'ubuntu-22.04' + vmImage: 'ubuntu-20.04' stages: diff --git a/infra/image/build.sh b/infra/image/build.sh index 6da8179191..7ee65d6180 100755 --- a/infra/image/build.sh +++ b/infra/image/build.sh @@ -36,8 +36,7 @@ EOF name="ansible-freeipa-image-builder" hostname="ipaserver.test.local" -# Number of cpus is not available in usptream CI (Ubuntu 22.04). -# cpus="2" +cpus="2" memory="3g" quayname="quay.io/ansible-freeipa/upstream-tests" deploy_server="N"