Skip to content

[Packaging] Drop Mariner 1.0 RPM package #24039

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

Merged
jiasli merged 1 commit into from
Sep 29, 2022
Merged

[Packaging] Drop Mariner 1.0 RPM package #24039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 3 additions & 12 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,21 +600,15 @@ jobs:
vmImage: 'ubuntu-20.04'
strategy:
matrix:
1.0:
image: cblmariner.azurecr.io/base/core
tag: 1.0
2.0:
image: mcr.microsoft.com/cbl-mariner/base/core
tag: 2.0
image: mcr.microsoft.com/cbl-mariner/base/core:2.0
Copy link
Member Author

@jiasli jiasli Sep 28, 2022

Choose a reason for hiding this comment

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

No need to have a separate variable tag. We can combine it with image.

artifact: rpm-mariner2.0
steps:
- task: Bash@3
displayName: 'Build Rpm Package: Mariner'
inputs:
targetType: 'filePath'
filePath: scripts/release/rpm/pipeline_mariner.sh
env:
IMAGE: $(image)
TAG: $(tag)
Comment on lines -615 to -617
Copy link
Member Author

@jiasli jiasli Sep 28, 2022

Choose a reason for hiding this comment

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

https://learn.microsoft.com/en-us/azure/devops/pipelines/process/variables?view=azure-devops&tabs=yaml%2Cbatch#environment-variables

System and user-defined variables also get injected as environment variables for your platform. When variables are turned into environment variables, variable names become uppercase, and periods turn into underscores. For example, the variable name any.variable becomes the variable name $ANY_VARIABLE.

So we don't need to explicitly declare env vars.


- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
displayName: 'SBOM'
Expand All @@ -625,7 +619,7 @@ jobs:
displayName: 'Publish Artifact: rpm-mariner'
inputs:
TargetPath: $(Build.ArtifactStagingDirectory)
ArtifactName: rpm-mariner$(tag)
ArtifactName: $(artifact)

# TODO: rpmbuild on Red Hat UBI 8 is slow for unknown reason. Still working with Red Hat to investigate.
- job: BuildRpmPackages
Expand Down Expand Up @@ -662,9 +656,6 @@ jobs:
inputs:
targetType: 'filePath'
filePath: scripts/release/rpm/pipeline.sh
env:
IMAGE: $(image)
TAG: $(tag)
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
displayName: 'SBOM'
inputs:
Expand Down
7 changes: 3 additions & 4 deletions scripts/release/rpm/mariner.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
ARG tag=2.0
ARG image=mcr.microsoft.com/cbl-mariner/base/core
ARG image=mcr.microsoft.com/cbl-mariner/base/core:2.0

FROM ${image}:${tag} AS build-env
FROM ${image} AS build-env
ARG cli_version=dev

RUN tdnf update -y
Expand All @@ -19,7 +18,7 @@ RUN dos2unix ./scripts/release/rpm/azure-cli.spec && \
rpmbuild -v -bb --clean scripts/release/rpm/azure-cli.spec && \
cp /usr/src/mariner/RPMS/x86_64/azure-cli-${cli_version}-1.x86_64.rpm /azure-cli-dev.rpm

FROM ${image}:${tag} AS execution-env
FROM ${image} AS execution-env

RUN tdnf update -y
RUN tdnf install -y python3 rpm
Expand Down
2 changes: 1 addition & 1 deletion scripts/release/rpm/pipeline.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set -exv

# DOCKERFILE should be one of 'ubi' or 'fedora'
: "${DOCKERFILE:?DOCKERFILE environment variable not set.}"
# IMAGE should be RHEL or Fedora image url
# IMAGE should be RHEL or Fedora docker image url
: "${IMAGE:?IMAGE environment variable not set.}"
# PYTHON_PACKAGE should be python package name
: "${PYTHON_PACKAGE:?PYTHON_PACKAGE environment variable not set.}"
Expand Down
9 changes: 4 additions & 5 deletions scripts/release/rpm/pipeline_mariner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,25 @@
set -exv

: "${BUILD_STAGINGDIRECTORY:?BUILD_STAGINGDIRECTORY environment variable not set.}"

# IMAGE should be Mariner docker image url, such as mcr.microsoft.com/cbl-mariner/base/core:2.0
: "${IMAGE:?IMAGE environment variable not set.}"
: "${TAG:?TAG environment variable not set.}"

CLI_VERSION=`cat src/azure-cli/azure/cli/__main__.py | grep __version__ | sed s/' '//g | sed s/'__version__='// | sed s/\"//g`

# Create a container image that includes the source code and a built RPM using this file.
docker build \
--target build-env \
--build-arg image=${IMAGE} \
--build-arg tag=${TAG} \
--build-arg cli_version=${CLI_VERSION} \
--build-arg image=${IMAGE} \
-f ./scripts/release/rpm/mariner.dockerfile \
-t azure/azure-cli:mariner-builder \
.

# Continue the previous build, and create a container that has the current azure-cli build but not the source code.
docker build \
--build-arg image=${IMAGE} \
--build-arg tag=${TAG} \
--build-arg cli_version=${CLI_VERSION} \
--build-arg image=${IMAGE} \
-f ./scripts/release/rpm/mariner.dockerfile \
-t azure/azure-cli:mariner \
.
Expand Down