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.web10.403.1664211734627804939 for ; Mon, 26 Sep 2022 10:02:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Ev+E1ZYP; 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=1664211733; 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: in-reply-to:in-reply-to:references:references; bh=mBD50CRe92UnYgDENfXNmiH8zc4ZU076zypLqxYsHRg=; b=Ev+E1ZYPAag1vHv0uefi4aK/2/fQKi/GFM1XysyoC87Weiq3frnK0I0kHQYSLMuw1vPZlu aj0zIpjj3wug7/E9NMVccNoov0vxRjf4Jr7f1E7QKuAC6glCS8loR4ZwzyyHZT0Njii1GT rBuvCLIfhuB8c0JJPDVcBcOZGfP/1Xk= Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-310--3mgp1hhPlC6yQjI9NcnUg-1; Mon, 26 Sep 2022 12:31:40 -0400 X-MC-Unique: -3mgp1hhPlC6yQjI9NcnUg-1 Received: by mail-lf1-f72.google.com with SMTP id b16-20020a056512061000b0049771081af2so2568889lfe.5 for ; Mon, 26 Sep 2022 09:31:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date; bh=mBD50CRe92UnYgDENfXNmiH8zc4ZU076zypLqxYsHRg=; b=K523fVJnzG75YhOIspV7Imsclys4dk699x+Gy8DyRpUHnbgpRnzdRkJ188rvwe6Nqh fF1DsDgtBIhfOLZsb8cNi588YR88y9QGZ1XsJrbi5ykBd7QuETMgyB3LaYYWOfcADbuB g5hRcRGDeNvX0aB78F/gwZm25IQKmERKrjW1jm+STHyxOZCJ30u5DnoS/qEkqzOKoQCv BVi23+hTk2A68ETLX++y6cvUo3A5n8X4LCdJBdT/J6Fne4XETcrVaOcCcK9fbenq3L7H JIeRavAgPKFwDV/TAAYZ1EN1rIXn9SIgsSchl0P5DKyvdxLVIV/tGV/cwP6jBxMwhHzZ srUg== X-Gm-Message-State: ACrzQf0YphQimFDeA6TtTOFwykAlMPTp5Ec1MscRBD3Z8gbGcyZ/ahh4 I9nn2e/hOGLlL8dqPP6IP94WXfLEcg3tNZoJRzxivUq7clSHDoBU9MyOcvL1ooUlw+SqvGzi4Xw S5dVSro07ycejB4Gmc/FLxmgXmraobA== X-Received: by 2002:a05:6512:4006:b0:4a1:b269:6001 with SMTP id br6-20020a056512400600b004a1b2696001mr4109775lfb.400.1664209897778; Mon, 26 Sep 2022 09:31:37 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7QRjpdZ6gf5hOgdhrwZ/h6u/VjGbjFdkLF+YFAwAJjqmXQttZKLeX5LiDNRz1cuI8Zfs+nVXIRkVWvhpRjLc0= X-Received: by 2002:a05:6512:4006:b0:4a1:b269:6001 with SMTP id br6-20020a056512400600b004a1b2696001mr4109756lfb.400.1664209897571; Mon, 26 Sep 2022 09:31:37 -0700 (PDT) Received: from 567203818698 named unknown by gmailapi.google.com with HTTPREST; Mon, 26 Sep 2022 09:31:36 -0700 From: "Oliver Steffen" X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926163129.85032-1-osteffen@redhat.com> References: <20220926163129.85032-1-osteffen@redhat.com> MIME-Version: 1.0 Date: Mon, 26 Sep 2022 09:31:36 -0700 Message-ID: Subject: [PATCH v6 4/5] CI: Use Fedora 35 container (Linux only) To: devel@edk2.groups.io Cc: Oliver Steffen , Andrew Fish , Ard Biesheuvel , Bob Feng , Gerd Hoffmann , Jiewen Yao , Jordan Justen , Leif Lindholm , Liming Gao , Michael D Kinney , Michael Kubacki , Ray Ni , Sami Mujawar , Sean Brogan , Yuwei Chen , Pawel Polawski X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" 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 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 | 2 ++ .azurepipelines/templates/basetools-build-steps.yml | 9 --------- ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml | 7 +++---- EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml | 3 +++ OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml | 7 +++---- 5 files changed, 11 insertions(+), 17 deletions(-) diff --git a/.azurepipelines/Ubuntu-GCC5.yml b/.azurepipelines/Ubuntu-GCC5.yml index 3760c6efe105..bbd2a0bff0f7 100644 --- a/.azurepipelines/Ubuntu-GCC5.yml +++ b/.azurepipelines/Ubuntu-GCC5.yml @@ -17,5 +17,7 @@ jobs: parameters: tool_chain_tag: 'GCC5' vm_image: 'ubuntu-latest' + container: 'ghcr.io/tianocore/containers/fedora-35-test:46de622' + usePythonVersion: '' # use Python from the container image arch_list: "IA32,X64,ARM,AARCH64,RISCV64" 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/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml index b07e3199f143..137cb3b8459e 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/tianocore/containers/fedora-35-test:46de622' + steps: - template: ../../../.azurepipelines/templates/platform-build-run-steps.yml parameters: @@ -85,7 +87,4 @@ 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()) + usePythonVersion: '' # use Python from the container image diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml index 416c15e70840..72d33f4df741 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/tianocore/containers/fedora-35-test:46de622' + steps: - template: ../../../.azurepipelines/templates/platform-build-run-steps.yml parameters: @@ -85,3 +87,4 @@ jobs: build_file: $(Build.File) build_flags: $(Build.Flags) run_flags: $(Run.Flags) + usePythonVersion: '' # use Python from the container image diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml index 7160d95f7e04..d63d39afb482 100644 --- a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml +++ b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml @@ -177,6 +177,8 @@ jobs: pool: vmImage: $(vm_image) + container: 'ghcr.io/tianocore/containers/fedora-35-test:46de622' + steps: - template: ../../../.azurepipelines/templates/platform-build-run-steps.yml parameters: @@ -187,7 +189,4 @@ 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()) + usePythonVersion: '' # use Python from the container image -- 2.37.3