Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Packaging] Add Ubuntu 22.04 Jammy Jellyfish support #21948

Merged
merged 3 commits into from
Apr 8, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -816,8 +816,6 @@ jobs:

- job: BuildDebPackages
displayName: Build Deb Packages

dependsOn: BuildPythonWheel
condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'Manual', 'Schedule'))
pool:
vmImage: 'ubuntu-20.04'
Expand All @@ -840,6 +838,10 @@ jobs:
# 21.10
deb_system: ubuntu
distro: impish
Jammy:
# 22.04
deb_system: ubuntu
distro: jammy

# https://wiki.debian.org/DebianReleases
Stretch:
Expand All @@ -855,12 +857,6 @@ jobs:
deb_system: debian
distro: bullseye
steps:
- task: DownloadPipelineArtifact@1
displayName: 'Download Build Artifacts'
inputs:
TargetPath: '$(Build.ArtifactStagingDirectory)/pypi'
artifactName: pypi
Comment on lines -858 to -862
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since #9820 switched from installing using whl to requirements.py3.$(uname).txt, it is needless to download built whls.


- task: Bash@3
displayName: 'Build $(deb_system) $(distro) Package'
inputs:
Expand Down
4 changes: 0 additions & 4 deletions scripts/release/debian/pipeline.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,3 @@ docker run --rm \
-e DEBIAN_FRONTEND=noninteractive \
$DISTRO_BASE_IMAGE \
/mnt/repo/scripts/release/debian/build.sh

if [ -d $BUILD_STAGINGDIRECTORY/pypi ]; then
rm -rf $BUILD_STAGINGDIRECTORY/pypi
fi