diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 98e767d87a5..f3bbefbef5a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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 @@ -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 diff --git a/scripts/release/rpm/Dockerfile.mariner b/scripts/release/rpm/Dockerfile.mariner index 518632b580a..5761b09e4f6 100644 --- a/scripts/release/rpm/Dockerfile.mariner +++ b/scripts/release/rpm/Dockerfile.mariner @@ -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 WORKDIR /azure-cli diff --git a/scripts/release/rpm/mariner_pipeline.sh b/scripts/release/rpm/pipeline_mariner.sh old mode 100755 new mode 100644 similarity index 100% rename from scripts/release/rpm/mariner_pipeline.sh rename to scripts/release/rpm/pipeline_mariner.sh