From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mx.groups.io with SMTP id smtpd.web11.203286.1673976454493100891 for ; Tue, 17 Jan 2023 09:27:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=i24K0rql; spf=pass (domain: linux.microsoft.com, ip: 13.77.154.182, mailfrom: mikuback@linux.microsoft.com) Received: from [192.168.4.22] (unknown [47.201.8.94]) by linux.microsoft.com (Postfix) with ESMTPSA id EE62820DFE9D; Tue, 17 Jan 2023 09:27:31 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com EE62820DFE9D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1673976454; bh=cR65Zae09hR7HTN1QTWz8AX9galWKQS1RaNoJxonAhY=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=i24K0rqlVhIt8DlBCe9lKcxheKhKHzjSNqIYhVqaapsN1FZGGYd16BH0U/09stS/u 7NadzwwoLjiZh4JoELfzOQuNzfZXywk0Orqu7KPV0qUmeXzsYZ83h0qqTEFoeYvcEz 6qsM1l54/YEOilirpf6nXVRV4XH1HuK5Ox5xSNlo= Message-ID: <95b1a1b5-2004-6964-3a56-8891db923a5a@linux.microsoft.com> Date: Tue, 17 Jan 2023 12:27:30 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 6.2; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.13.1 Subject: Re: [PATCH v11 07/17] CI: Use Fedora 35 container (Linux only) To: Oliver Steffen , devel@edk2.groups.io Cc: Andrew Fish , Ard Biesheuvel , Bob Feng , Dandan Bi , Gerd Hoffmann , Jian J Wang , Jiewen Yao , Jordan Justen , Leif Lindholm , Liming Gao , Michael D Kinney , Ray Ni , Sami Mujawar , Sean Brogan , Yuwei Chen , Pawel Polawski , chris.fernald@outlook.com References: <20230116174044.3346383-1-osteffen@redhat.com> <20230116174044.3346383-8-osteffen@redhat.com> From: "Michael Kubacki" In-Reply-To: <20230116174044.3346383-8-osteffen@redhat.com> Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Reviewed-by: Michael Kubacki On 1/16/2023 12:40 PM, Oliver Steffen wrote: > 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 > --- > .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"