Skip to content

Commit

Permalink
[Packaging] Add Ubuntu 22.04 Jammy Jellyfish support (Azure#21948)
Browse files Browse the repository at this point in the history
  • Loading branch information
jiasli authored Apr 8, 2022
1 parent 061c1ee commit 1ecfb36
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 13 deletions.
19 changes: 10 additions & 9 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

- task: Bash@3
displayName: 'Build $(deb_system) $(distro) Package'
inputs:
Expand All @@ -883,7 +879,6 @@ jobs:

- job: TestDebPackages
displayName: Test Deb Packages

dependsOn:
- BuildDebPackages
condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'Manual', 'Schedule'))
Expand All @@ -892,9 +887,15 @@ jobs:
Focal:
deb_system: ubuntu
distro: focal
Jammy:
deb_system: ubuntu
distro: jammy
Buster:
deb_system: debian
distro: buster
Bullseye:
deb_system: debian
distro: bullseye
pool:
vmImage: 'ubuntu-20.04'
steps:
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

0 comments on commit 1ecfb36

Please sign in to comment.