From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.1590.1650353797925288398 for ; Tue, 19 Apr 2022 00:36:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=BlPPFA84; spf=pass (domain: redhat.com, ip: 170.10.133.124, mailfrom: osteffen@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650353797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g1bSZ8xYingiMwFqgX1VMTbWpu6hlz/KABmTFiWXTTs=; b=BlPPFA84ZyvgvS5KkSZ+ipKCirTBbDqSplAD/t0LvKzwXPhUMPaeAHFfu8hso0aVHmlMw/ WrNPehZRESaE6KP/LRR6gOPOCZ0ZcgqKmvM86P4UeTqhjVRHiq5BOnsBbWzpp3UT2AOJTz ayQjLxGaP5ts44K/vOdWVhjWGSYyvMo= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-64-oEcayI21PyS9krFxNWCW6Q-1; Tue, 19 Apr 2022 03:36:36 -0400 X-MC-Unique: oEcayI21PyS9krFxNWCW6Q-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 70D612999B44; Tue, 19 Apr 2022 07:36:35 +0000 (UTC) Received: from osteffen-laptop.fritz.box (unknown [10.39.192.173]) by smtp.corp.redhat.com (Postfix) with ESMTP id E4B9742B94E; Tue, 19 Apr 2022 07:36:32 +0000 (UTC) From: "Oliver Steffen" To: devel@edk2.groups.io Cc: afish@apple.com, ardb+tianocore@kernel.org, bob.c.feng@intel.com, Bret.Barkelew@microsoft.com, 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, Oliver Steffen Subject: [PATCH 3/4] CI: Use Fedora 35 container (Linux only) Date: Tue, 19 Apr 2022 09:36:13 +0200 Message-Id: <20220419073614.166053-4-osteffen@redhat.com> In-Reply-To: <20220419073614.166053-1-osteffen@redhat.com> References: <20220419073614.166053-1-osteffen@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=osteffen@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 --- .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