Skip to content

[DO NOT MERGE] Release 2.31.0 for Mariner #20620

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.

Sign up for GitHub

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

Closed
jiasli wants to merge 2 commits into from
Closed

[DO NOT MERGE] Release 2.31.0 for Mariner #20620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6f7a80
[Packaging] Add CI job to build Mariner RPM (#20584)
mfrw Dec 6, 2021
84d6bd2
{Packaging} Fix Mariner docker file to build azure-cli rpm cleanly (#…
chalamalasetty Dec 6, 2021
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
21 changes: 19 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,24 @@ jobs:

displayName: 'Test Homebrew Package'


- job: BuildYumPackageMariner
displayName: Build Yum Package Mariner
pool:
vmImage: 'ubuntu-20.04'
steps:
- task: Bash@3
displayName: 'Build Rpm Package: Mariner'
inputs:
targetType: 'filePath'
filePath: scripts/release/rpm/pipeline_mariner.sh
- task: PublishPipelineArtifact@0
displayName: 'Publish Artifact: yum-mariner'
inputs:
TargetPath: $(Build.ArtifactStagingDirectory)
ArtifactName: yum-mariner


- job: BuildYumPackage
displayName: Build Yum Package

Expand All @@ -691,14 +709,13 @@ jobs:
inputs:
targetType: 'filePath'
filePath: scripts/release/rpm/pipeline.sh


- task: PublishPipelineArtifact@0
displayName: 'Publish Artifact: yum'
inputs:
TargetPath: $(Build.ArtifactStagingDirectory)
ArtifactName: yum


- job: TestYumPackage
displayName: Test Yum Package
timeoutInMinutes: 120
Expand Down
2 changes: 1 addition & 1 deletion scripts/release/rpm/Dockerfile.mariner
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM cblmariner.azurecr.io/base/core:${tag} AS build-env
ARG cli_version=dev

RUN tdnf update -y
RUN tdnf install -y rpm-build gcc libffi-devel python3-devel openssl-devel make diffutils patch dos2unix python3-virtualenv perl
RUN tdnf install -y binutils file rpm-build gcc libffi-devel python3-devel openssl-devel make diffutils patch dos2unix python3-virtualenv perl
Copy link
Member

@mfrw mfrw Dec 6, 2021

Choose a reason for hiding this comment

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

Did some local testing with these changes.
LGTM :)

image


WORKDIR /azure-cli

Expand Down
0 scripts/release/rpm/mariner_pipeline.sh → scripts/release/rpm/pipeline_mariner.sh
100755 → 100644
View file
Open in desktop
File renamed without changes.