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.160016.1669750007163739869 for ; Tue, 29 Nov 2022 11:26:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ORaRcAGk; 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=1669750006; 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=rNXJqf0jktXsHZmh2Y1bbrBZHbFpEGFvMZiuOFmxPaI=; b=ORaRcAGkULwcYLPPVWS61BWWCO+9My3NqAn/Wy0/7pvqNMsZNVE1bKIKm1wwjzvlyaIPOt RZqhJ1RQOSIzmOuROHmnM108Gc/ijqWpVAYt7iKLoZVKy9FQI1YU1E3CBCGvSbIaS92TQV VftBGaqSAvfL5n/R9pfSVVMDUrO074A= Received: from mail-lj1-f198.google.com (mail-lj1-f198.google.com [209.85.208.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-624-70r_sEEZPWWlC8YqAnyJeg-1; Tue, 29 Nov 2022 14:26:45 -0500 X-MC-Unique: 70r_sEEZPWWlC8YqAnyJeg-1 Received: by mail-lj1-f198.google.com with SMTP id q14-20020a2eb4ae000000b00279a24cd94fso1749967ljm.3 for ; Tue, 29 Nov 2022 11:26:44 -0800 (PST) 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:message-id:reply-to; bh=rNXJqf0jktXsHZmh2Y1bbrBZHbFpEGFvMZiuOFmxPaI=; b=qmvJl3kiuEfgVEdFuKMUUdq71IAjcnw9jfvmrsaHHIBl8v0DexP3mH32B2Uu93g/QD 1rYUZJYAPJJxhlOFFGfxIOE3QdQaoTFZMCVr73ee1LCq/iVErUhDQsmOl41oDx+ZO9Hg EENiv2B502EOOOsSMy4cY7muGIoWfAUT8JurEyqrLYJfe8KDp6W+nN6nQkJA6FvSlPQd AxvW61lAkQlr9RNC5WP9O+D+DnVHULF0mheznMI5waA2Fu+YOQczpVLMKsV5TkNgT/Cj c+mFqorWGrtYnjM0VatVsHBdsxpUhPCFu3v9UNdS+2iRk1QAnHR5NVqQ01FAwdMz2B+A UqZQ== X-Gm-Message-State: ANoB5pm4lK5pAkIotPSgdC1Fnqcl+GhGdolN0pSRc2cdVxzDlmJqSkTL yh1FINwxJ9ItODkPi91tjcIKAy3M79E5vqxP1HzacQj/m334K7M7Bt/cEoL/TophmCe+phBhn1l NpqISFiEAZlD84CDMjEf/0911RXdI6A== X-Received: by 2002:ac2:5e70:0:b0:4ad:3f25:60f4 with SMTP id a16-20020ac25e70000000b004ad3f2560f4mr13775568lfr.92.1669750003309; Tue, 29 Nov 2022 11:26:43 -0800 (PST) X-Google-Smtp-Source: AA0mqf6QuoarfIRSzPM3D+piKamXk0tAn4QKSPziAjxlKxJseG3gBxTB5aG2OH1MNpm2XN+I0ft0r7xwiTF1Qa0y/pM= X-Received: by 2002:ac2:5e70:0:b0:4ad:3f25:60f4 with SMTP id a16-20020ac25e70000000b004ad3f2560f4mr13775524lfr.92.1669750003056; Tue, 29 Nov 2022 11:26:43 -0800 (PST) Received: from 567203818698 named unknown by gmailapi.google.com with HTTPREST; Tue, 29 Nov 2022 14:26:42 -0500 From: "Oliver Steffen" X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221129192625.643896-1-osteffen@redhat.com> References: <20221129192625.643896-1-osteffen@redhat.com> MIME-Version: 1.0 Date: Tue, 29 Nov 2022 14:26:42 -0500 Message-ID: Subject: [PATCH v7 4/6] CI: Use Fedora 35 container (Linux only) To: devel@edk2.groups.io Cc: Abner Chang , Alexei Fedorov , Andrew Fish , Anthony Perard , Ard Biesheuvel , Bob Feng , Brijesh Singh , Chasel Chiu , Daniel Schaefer , Erdem Aktas , Eric Dong , Gerd Hoffmann , Gua Guo , Guo Dong , Guomin Jiang , Hao A Wu , Igor Kulchytskyy , James Bottomley , James Lu , Jian J Wang , Jiaxin Wu , Jiewen Yao , Jordan Justen , Julien Grall , Leif Lindholm , Liming Gao , Maciej Rabeda , Michael D Kinney , Michael Kubacki , Min Xu , Nate DeSimone , Nickle Wang , Peter Grehan , Pierre Gondois , Rahul Kumar , Ray Ni , Rebecca Cran , Sami Mujawar , Sean Brogan , Sean Rhodes , Sebastien Boeuf , Siyuan Fu , Star Zeng , Sunil V L , Supreeth Venkatesh , Tom Lendacky , Wei6 Xu , Xiaoyu Lu , Yuwei Chen , Zhichao Gao , Zhiguang Liu , Pawel Polawski , Chris Fernald , Oliver Steffen 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 1acd8d2a46a7..7c7732d66fc0 100644 --- a/.azurepipelines/Ubuntu-GCC5.yml +++ b/.azurepipelines/Ubuntu-GCC5.yml @@ -18,5 +18,7 @@ jobs: parameters: tool_chain_tag: 'GCC5' vm_image: 'ubuntu-latest' + container: 'ghcr.io/tianocore/containers/fedora-35-test:0b7ecfa' + usePythonVersion: '' # use Python from the container image arch_list: "IA32,X64,ARM,AARCH64,RISCV64,LOONGARCH64" 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..e29168537048 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:0b7ecfa' + 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..88f5df8a37d9 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:0b7ecfa' + 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..836e73467ca2 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:0b7ecfa' + 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.38.1