From: "Oliver Steffen" <osteffen@redhat.com>
To: osteffen@redhat.com
Cc: afish@apple.com, ardb+tianocore@kernel.org, bob.c.feng@intel.com,
Bret.Barkelew@microsoft.com, devel@edk2.groups.io,
gaoliming@byosoft.com.cn, jiewen.yao@intel.com,
jordan.l.justen@intel.com, kraxel@redhat.com,
michael.d.kinney@intel.com, quic_llindhol@quicinc.com,
ray.ni@intel.com, sami.mujawar@arm.com,
sean.brogan@microsoft.com, yuwei.chen@intel.com
Subject: [PATCH 3/4] CI: Use Fedora 35 container (Linux only)
Date: Tue, 19 Apr 2022 09:34:47 +0200 [thread overview]
Message-ID: <20220419073448.165566-4-osteffen@redhat.com> (raw)
In-Reply-To: <20220419073448.165566-1-osteffen@redhat.com>
Run all Linux based jobs in a container, using a custom Fedora 35 image
(gcc 11). The image is hosted on ghcr.io and the container-files are
here: https://github.com/osteffenrh/edk2-build-images.
Do not run apt-get to install qemu and gcc dependencies. Assume the
container image provides these.
Signed-off-by: Oliver Steffen <osteffen@redhat.com>
---
.azurepipelines/templates/basetools-build-steps.yml | 9 ---------
.azurepipelines/templates/pr-gate-build-job.yml | 3 +++
ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml | 6 ++----
EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml | 2 ++
OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml | 6 ++----
5 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/.azurepipelines/templates/basetools-build-steps.yml b/.azurepipelines/templates/basetools-build-steps.yml
index d8c108c6e212..a72758bc3395 100644
--- a/.azurepipelines/templates/basetools-build-steps.yml
+++ b/.azurepipelines/templates/basetools-build-steps.yml
@@ -10,15 +10,6 @@ parameters:
tool_chain_tag: ''
steps:
-- ${{ if contains(parameters.tool_chain_tag, 'GCC') }}:
- - bash: sudo apt-get update
- displayName: Update apt
- condition: and(gt(variables.pkg_count, 0), succeeded())
-
- - bash: sudo apt-get install gcc g++ make uuid-dev
- displayName: Install required tools
- condition: and(gt(variables.pkg_count, 0), succeeded())
-
- task: CmdLine@1
displayName: Build Base Tools from source
inputs:
diff --git a/.azurepipelines/templates/pr-gate-build-job.yml b/.azurepipelines/templates/pr-gate-build-job.yml
index 69e4c50afdbb..716664391957 100644
--- a/.azurepipelines/templates/pr-gate-build-job.yml
+++ b/.azurepipelines/templates/pr-gate-build-job.yml
@@ -63,6 +63,9 @@ jobs:
pool:
vmImage: ${{ parameters.vm_image }}
+ ${{ if contains(parameters.tool_chain_tag, 'GCC') }}
+ container: 'ghcr.io/osteffenrh/edk2-build-images/fedora-35:latest'
+
steps:
- template: pr-gate-steps.yml
parameters:
diff --git a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
index b07e3199f143..a0a79b7108c9 100644
--- a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
+++ b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
@@ -75,6 +75,8 @@ jobs:
pool:
vmImage: $(vm_image)
+ container: 'ghcr.io/osteffenrh/edk2-build-images/fedora-35:latest'
+
steps:
- template: ../../../.azurepipelines/templates/platform-build-run-steps.yml
parameters:
@@ -85,7 +87,3 @@ jobs:
build_file: $(Build.File)
build_flags: $(Build.Flags)
run_flags: $(Run.Flags)
- extra_install_step:
- - bash: sudo apt-get install qemu
- displayName: Install qemu
- condition: and(gt(variables.pkg_count, 0), succeeded())
diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
index 416c15e70840..589eea7d1985 100644
--- a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
+++ b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
@@ -75,6 +75,8 @@ jobs:
pool:
vmImage: $(vm_image)
+ container: 'ghcr.io/osteffenrh/edk2-build-images/fedora-35:latest'
+
steps:
- template: ../../../.azurepipelines/templates/platform-build-run-steps.yml
parameters:
diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
index 6dec90d9fcaf..45a97cd246f7 100644
--- a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
+++ b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
@@ -166,6 +166,8 @@ jobs:
pool:
vmImage: $(vm_image)
+ container: 'ghcr.io/osteffenrh/edk2-build-images/fedora-35:latest'
+
steps:
- template: ../../../.azurepipelines/templates/platform-build-run-steps.yml
parameters:
@@ -176,7 +178,3 @@ jobs:
build_file: $(Build.File)
build_flags: $(Build.Flags)
run_flags: $(Run.Flags)
- extra_install_step:
- - bash: sudo apt-get install qemu
- displayName: Install qemu
- condition: and(gt(variables.pkg_count, 0), succeeded())
--
2.35.1
next prev parent reply other threads:[~2022-04-19 7:35 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-19 7:34 [PATCH 0/4] CI: Use Fedora 35 container for Linux jobs Oliver Steffen
2022-04-19 7:34 ` [PATCH 1/4] CI: don't force python verison (Linux only) Oliver Steffen
2022-04-19 7:34 ` [PATCH 2/4] CI: add ~/.local/bin to PATH " Oliver Steffen
2022-04-19 7:34 ` Oliver Steffen [this message]
2022-04-19 7:34 ` [PATCH 4/4] BaseTools: Remove ext. gcc dependencies " Oliver Steffen
2022-04-19 21:54 ` [PATCH 0/4] CI: Use Fedora 35 container for Linux jobs Ard Biesheuvel
2022-04-20 7:30 ` Gerd Hoffmann
2022-04-20 9:16 ` Ard Biesheuvel
2022-04-20 9:32 ` [edk2-devel] " Oliver Steffen
-- strict thread matches above, loose matches on Subject: below --
2022-04-19 7:36 Oliver Steffen
2022-04-19 7:36 ` [PATCH 3/4] CI: Use Fedora 35 container (Linux only) Oliver Steffen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220419073448.165566-4-osteffen@redhat.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox