public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Oliver Steffen" <osteffen@redhat.com>
To: devel@edk2.groups.io
Cc: Andrew Fish <afish@apple.com>,
	Ard Biesheuvel <ardb+tianocore@kernel.org>,
	Bob Feng <bob.c.feng@intel.com>, Dandan Bi <dandan.bi@intel.com>,
	Gerd Hoffmann <kraxel@redhat.com>,
	Jian J Wang <jian.j.wang@intel.com>,
	Jiewen Yao <jiewen.yao@intel.com>,
	Jordan Justen <jordan.l.justen@intel.com>,
	Leif Lindholm <quic_llindhol@quicinc.com>,
	Liming Gao <gaoliming@byosoft.com.cn>,
	Michael D Kinney <michael.d.kinney@intel.com>,
	Michael Kubacki <mikuback@linux.microsoft.com>,
	Ray Ni <ray.ni@intel.com>, Sami Mujawar <sami.mujawar@arm.com>,
	Sean Brogan <sean.brogan@microsoft.com>,
	Yuwei Chen <yuwei.chen@intel.com>,
	Pawel Polawski <ppolawsk@redhat.com>,
	chris.fernald@outlook.com, Oliver Steffen <osteffen@redhat.com>
Subject: [PATCH v11 07/17] CI: Use Fedora 35 container (Linux only)
Date: Mon, 16 Jan 2023 18:40:34 +0100	[thread overview]
Message-ID: <20230116174044.3346383-8-osteffen@redhat.com> (raw)
In-Reply-To: <20230116174044.3346383-1-osteffen@redhat.com>

Run all Linux based jobs in a container, using a custom Fedora 35 image
(gcc 11).  The image URL specified in the defaults.yml template, so that
all CI jobs can use it. The image is hosted on ghcr.io and the
Dockerfiles are here: https://github.com/tianocore/containers The
version numbers of gcc, iasl, and nasm are pinned to avoid unintended
upgrades during image rebuild.

Do not run apt-get in CI jobs to install qemu and gcc dependencies.
Assume the container image provides these.

Use Python from the container image, do not download at runtime.

Signed-off-by: Oliver Steffen <osteffen@redhat.com>
---
 .azurepipelines/Ubuntu-GCC5.yml                     | 3 ++-
 .azurepipelines/templates/basetools-build-steps.yml | 9 ---------
 .azurepipelines/templates/defaults.yml              | 1 +
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.azurepipelines/Ubuntu-GCC5.yml b/.azurepipelines/Ubuntu-GCC5.yml
index 4ed6cb601b8e..246e2d272e20 100644
--- a/.azurepipelines/Ubuntu-GCC5.yml
+++ b/.azurepipelines/Ubuntu-GCC5.yml
@@ -21,6 +21,7 @@ jobs:
   parameters:
     tool_chain_tag: 'GCC5'
     vm_image: 'ubuntu-latest'
+    container: ${{ variables.default_linux_image }}
     arch_list: "IA32,X64,ARM,AARCH64,RISCV64,LOONGARCH64"
-    usePythonVersion: ${{ variables.default_python_version }}
+    usePythonVersion: ''  # use Python from the container image
 
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/defaults.yml b/.azurepipelines/templates/defaults.yml
index b4909448bdea..74d6b417839d 100644
--- a/.azurepipelines/templates/defaults.yml
+++ b/.azurepipelines/templates/defaults.yml
@@ -9,3 +9,4 @@
 
 variables:
   default_python_version: ">=3.10.6"
+  default_linux_image: "ghcr.io/tianocore/containers/fedora-35-test:47addc9"
-- 
2.39.0


  parent reply	other threads:[~2023-01-16 17:41 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-16 17:40 [PATCH v11 00/17] CI: Use Fedora 35 container for Linux jobs Oliver Steffen
2023-01-16 17:40 ` [PATCH v11 01/17] CI: make Python version configurable Oliver Steffen
2023-01-16 17:40 ` [PATCH v11 02/17] ArmVirtPkg: CI: use Python version from defaults template Oliver Steffen
2023-01-16 17:40 ` [PATCH v11 03/17] EmulatorPkg: " Oliver Steffen
2023-01-16 17:40 ` [PATCH v11 04/17] OvmfPkg: " Oliver Steffen
2023-01-17  0:14   ` [edk2-devel] " Yao, Jiewen
2023-01-16 17:40 ` [PATCH v11 05/17] CI: add ~/.local/bin to PATH (Linux only) Oliver Steffen
2023-01-16 17:40 ` [PATCH v11 06/17] CI: Allow running in a container Oliver Steffen
2023-01-16 17:40 ` Oliver Steffen [this message]
2023-01-17 17:27   ` [PATCH v11 07/17] CI: Use Fedora 35 container (Linux only) Michael Kubacki
2023-01-16 17:40 ` [PATCH v11 08/17] ArmVirtPkg: " Oliver Steffen
2023-01-17 17:27   ` Michael Kubacki
2023-01-16 17:40 ` [PATCH v11 09/17] EmulatorPkg: " Oliver Steffen
2023-01-17 17:28   ` Michael Kubacki
2023-01-16 17:40 ` [PATCH v11 10/17] OvmfPkg: " Oliver Steffen
2023-01-17  0:14   ` [edk2-devel] " Yao, Jiewen
2023-01-17 17:28   ` Michael Kubacki
2023-01-16 17:40 ` [PATCH v11 11/17] .pytool: CISettings.py: don't add scopes for GCC Oliver Steffen
2023-01-16 17:40 ` [PATCH v11 12/17] BaseTools: remove ext_dep files for gcc Oliver Steffen
2023-01-16 17:40 ` [PATCH v11 13/17] ArmVirtPkg: CI: use ubuntu-22.04 vm_image (Linux only) Oliver Steffen
2023-01-16 17:40 ` [PATCH v11 14/17] EmulatorPgk: " Oliver Steffen
2023-01-16 17:40 ` [PATCH v11 15/17] OvmfPkg: " Oliver Steffen
2023-01-17  0:15   ` [edk2-devel] " Yao, Jiewen
2023-01-16 17:40 ` [PATCH v11 16/17] CI: use ubuntu-22.04 image " Oliver Steffen
2023-01-16 17:40 ` [PATCH v11 17/17] OfmvPkg: CI: Qemu tests: set CPU to Broadwell Oliver Steffen
2023-01-17  0:16   ` Yao, Jiewen
2023-01-17 10:37     ` [edk2-devel] " Oliver Steffen
2023-01-17 12:20       ` Yao, Jiewen
2023-01-17 12:38         ` Gerd Hoffmann
2023-01-17 14:49           ` Yao, Jiewen
2023-01-17 14:52             ` Oliver Steffen
2023-01-17 18:22 ` [PATCH v11 00/17] CI: Use Fedora 35 container for Linux jobs Ard Biesheuvel

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=20230116174044.3346383-8-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