fixup! upstream CI: Use start.sh script and environment template

freeipa · Oct 22, 2024 · 59d7e87 · 59d7e87
1 parent c11b0ee
commit 59d7e87
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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"