Merged PR 687591: Produce an ubuntu-based sandbox

This change pushes to main the changes required to produce an Ubuntu-based sandbox to the current off band pipeline that produces the Linux sandbox package. This won't be needed after we start producing the sandbox in-build, but until that happens, this makes sure any changes in the sandbox that need publishing will be included in an Ubuntu-produced package.
This commit is contained in:
Serge Mera 2022-11-08 00:48:54 +00:00
Родитель 978f78b8a8
Коммит ecc77371dd
3 изменённых файлов: 7 добавлений и 26 удалений

Просмотреть файл

@ -8,7 +8,7 @@ resources:
ref: refs/tags/release
variables:
PackageArtifactName: runtime.linux-x64.BuildXL.${{ parameters.LinuxRuntimePackageVersion }}
PackageArtifactName: runtime.ubuntu-linux-x64.buildxl.${{ parameters.LinuxRuntimePackageVersion }}
PackageDir: $(Build.SourcesDirectory)/Public/Src/Sandbox/Linux/bin/$(PackageArtifactName)
parameters:
@ -29,19 +29,10 @@ extends:
template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines
parameters:
# quay.io/pypa/manylinux2014_x86_64 chosen because the Linux runtime binaries must be built for 'manylinux2014' (more precisely, against glibc 2.17)
pool:
name: 1ES-Shared-Hosted-Pool_Linux-Mariner-2
name: BuildXL-DevOpsAgents-Linux-PME
os: linux
containers:
default_linux_container:
image: quay.io/pypa/manylinux2014_x86_64
linux_container:
image: 1espipelinesdevpme.azurecr.io/linux/ubuntu-1804:latest
registry: 1espipelinesdevpme.azurecr.io
tenantId: PME
identityType: 1ESPipelineIdentity
stages:
- stage: Build
jobs:

Просмотреть файл

@ -34,16 +34,6 @@
#include "SandboxedPip.hpp"
#include "utils.h"
/*
* We want to compile against glibc 2.17 so that we are compatible with a broad range of Linux distributions. (e.g., starting from CentOS7)
*
* Compiling against that version of glibc does not prevent us from interposing the system calls that are present only in newer versions
* (e.g., copy_file_range), as long as we provide appropriate INTERPOSE definitions for those system calls in detours.cpp.
*/
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 17)
#warning This library must support glibc 2.17. Please compile against at most glibc 2.17 before publishing a new version of this library.
#endif
/*
* This header is compiled into two different libraries: libDetours.so and libAudit.so.
*

Просмотреть файл

@ -4,7 +4,7 @@ set -euo pipefail
readonly __dir=$(cd `dirname ${BASH_SOURCE[0]}` && pwd)
readonly version="$1"
readonly pkgName="runtime.linux-x64.BuildXL.${version}"
readonly pkgName="runtime.ubuntu-linux-x64.buildxl.${version}"
readonly binDir="${__dir}/bin"
if [[ ! -d "${binDir}/debug" ]] || [[ ! -d "${binDir}/release" ]]; then
@ -21,13 +21,13 @@ touch "${pkgName}/ref/netstandard/_._"
mkdir -p "${pkgName}/runtimes/linux-x64/native"
cp -r debug release "${pkgName}/runtimes/linux-x64/native"
cat > "${pkgName}/runtime.linux-x64.BuildXL.nuspec" <<EOF
cat > "${pkgName}/runtime.ubuntu-linux-x64.buildxl.nuspec" <<EOF
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>runtime.linux-x64.BuildXL</id>
<id>runtime.ubuntu-linux-x64.buildxl</id>
<version>${version}</version>
<title>runtime.linux-x64.BuildXL</title>
<title>runtime.ubuntu-linux-x64.buildxl</title>
<authors>Microsoft</authors>
<owners>microsoft,buildxl,bxl</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>