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.129.124]) by mx.groups.io with SMTP id smtpd.web11.56245.1669926502253141382 for ; Thu, 01 Dec 2022 12:28:22 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=DsiC1N24; spf=pass (domain: redhat.com, ip: 170.10.129.124, mailfrom: osteffen@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669926501; 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=MZt0eYRKRiFP8zlo99rFBbzibZLua+iUS3qPaXV5lX4=; b=DsiC1N24PkShIMrP1jwABvIdsaV7p+8eapGG8CiFScV9XnT579U9gXHJp0iZaZkJINTo0L rypIDgARyNVEjCi501RpAy88dmUjTsBNa0GUDv/N/1p3oyG4tF5BHCZ3cf7Mlq5UzQVG93 E6a8IVN9x/ms6Ll1lzLowcgaiX6IDRg= Received: from mail-lj1-f199.google.com (mail-lj1-f199.google.com [209.85.208.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-541-G0rHq1NMPpm2l74jbCvA_A-1; Thu, 01 Dec 2022 15:28:20 -0500 X-MC-Unique: G0rHq1NMPpm2l74jbCvA_A-1 Received: by mail-lj1-f199.google.com with SMTP id m10-20020a2e97ca000000b00279c3a7847fso608853ljj.17 for ; Thu, 01 Dec 2022 12:28:19 -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=MZt0eYRKRiFP8zlo99rFBbzibZLua+iUS3qPaXV5lX4=; b=Aez7GS3Sw045uRphix5nEE7UMfRPY8sLRh9XqpvW7e1fglN8jFJ/2aDAn22Ygdmh+C xlV9W0nzd72jVcpvlYMQBXFbJPZC5cJs4VhrXriYp6L8SgYmrfUbyJSqvs1IjjrMrJAw fYf90V2WB8wKYtF34y1YvnnhtX0AEhmzFpLYOSkSaqF9msWVjSQZo8hBHa8r5LD1cPgg qYqSeuUK2+SgJ0Ly5RCvZQ/yf6gVMXiDdf/frzHXxH8YdMWi3kSBq4F23voNZYkByWxl HcLwmmOxd2eFN69uXXT/HNNSnhbYABkHFNl5YWeRJ6IsjFbw5BHYJcOweb3R7A+IHlTN 1dEw== X-Gm-Message-State: ANoB5pnc1pwNdkisjUMrRmpSv7RvEczbchYtHUFk6MYVV3ymMXYoUsRc FTcCU6FCAZNMkxpDMyZZ0lyZ9LjY0yr9i3jdKI5nhOZM40YigvOB2tRDhZDvV2SYNtYI0omOyLV qXDOM54DApMZvLSktnaoQKdAPqYu/+g== X-Received: by 2002:a05:6512:32cc:b0:4a6:2ff6:f32f with SMTP id f12-20020a05651232cc00b004a62ff6f32fmr19013601lfg.1.1669926498326; Thu, 01 Dec 2022 12:28:18 -0800 (PST) X-Google-Smtp-Source: AA0mqf5fFODC3OOX8Bz7EitrN8lOptxgdemB3UldS/8sjvhDEDGlv98g0tvpRRaAI99J71+1wqebojWgqIzjtaRJ6Gc= X-Received: by 2002:a05:6512:32cc:b0:4a6:2ff6:f32f with SMTP id f12-20020a05651232cc00b004a62ff6f32fmr19013577lfg.1.1669926498057; Thu, 01 Dec 2022 12:28:18 -0800 (PST) Received: from 567203818698 named unknown by gmailapi.google.com with HTTPREST; Thu, 1 Dec 2022 12:28:17 -0800 From: "Oliver Steffen" X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221201202810.109662-1-osteffen@redhat.com> References: <20221201202810.109662-1-osteffen@redhat.com> MIME-Version: 1.0 Date: Thu, 1 Dec 2022 12:28:17 -0800 Message-ID: Subject: [PATCH v10 04/17] OvmfPkg: CI: use Python version from defaults template To: devel@edk2.groups.io Cc: Andrew Fish , Ard Biesheuvel , Bob Feng , Daniel Schaefer , Gerd Hoffmann , Jiewen Yao , Jordan Justen , Leif Lindholm , Liming Gao , Michael D Kinney , Michael Kubacki , Ray Ni , Sami Mujawar , Sean Brogan , Sunil V L , Yuwei Chen , 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" Use the default Python version from the defaults template (.azurepipelines/templates/defaults.yml) in the Windows and Linux CI jobs. Previous changes to the CI job templates make it necessary to specify a version number, if Python shall be pulled at CI runtime. Signed-off-by: Oliver Steffen --- OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml | 4 ++++ OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml index 7160d95f7e04..6dd90711ac70 100644 --- a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml +++ b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml @@ -15,6 +15,9 @@ pr: - master - stable/* +variables: + - template: ../../../.azurepipelines/templates/defaults.yml + jobs: - job: Platform_CI variables: @@ -187,6 +190,7 @@ jobs: build_file: $(Build.File) build_flags: $(Build.Flags) run_flags: $(Run.Flags) + usePythonVersion: ${{ variables.default_python_version }} extra_install_step: - bash: sudo apt-get install qemu displayName: Install qemu diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml index 7d6344d6383d..7e63f419b26b 100644 --- a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml +++ b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml @@ -14,6 +14,10 @@ trigger: pr: - master - stable/* + +variables: + - template: ../../../.azurepipelines/templates/defaults.yml + jobs: - job: Platform_CI variables: @@ -133,6 +137,7 @@ jobs: build_file: $(Build.File) build_flags: $(Build.Flags) run_flags: $(Run.Flags) + usePythonVersion: ${{ variables.default_python_version }} extra_install_step: - powershell: choco install qemu --version=2021.5.5; Write-Host "##vso[task.prependpath]c:\Program Files\qemu" displayName: Install QEMU and Set QEMU on path # friendly name displayed in the UI -- 2.38.1