Skip to content

Update pipeline to handle new infra #1467

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
mthalman merged 3 commits into from
Jul 3, 2025
Merged

Update pipeline to handle new infra #1467

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6465cb6
Update pipeline to handle new infra
mthalman Jul 2, 2025
c46fd19
use mariner 2.0
mthalman Jul 3, 2025
cf0d3dc
Remove Kusto service connection
mthalman Jul 3, 2025
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
16 changes: 16 additions & 0 deletions eng/pipelines/dotnet-buildtools-prereqs-all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@ parameters:
type: boolean
default: false

- name: sourceBuildPipelineRunId
displayName: >
Source build pipeline run ID. This refers to runs of *this pipeline*.
Override this parameter in combination with disabling the `Build` stage to
test or publish images that were built in a different pipeline run. When
building new images, leave this value alone.
type: string
default: $(Build.BuildId)

schedules:
- cron: "0 5 1,15 * *"
displayName: Monthly rebuild of all images
Expand All @@ -32,12 +41,19 @@ variables:
- template: /eng/pipelines/variables/common.yml@self
parameters:
disableMatrixTrimming: ${{ parameters.disableMatrixTrimming }}
sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }}
- name: publishEolAnnotations
value: true

extends:
template: /eng/common/templates/1es-official.yml@self
parameters:
serviceConnections:
- name: $(internal-mirror.serviceConnectionName)
- name: $(build.serviceConnectionName)
- name: $(publish.serviceConnectionName)
- name: $(kusto.serviceConnectionName)
Comment thread
mthalman marked this conversation as resolved.
Outdated
- name: $(marStatus.serviceConnectionName)
stages:
- template: /eng/pipelines/stages/build-test-publish-repo.yml@self
parameters:
Expand Down
7 changes: 7 additions & 0 deletions eng/pipelines/variables/common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,16 @@ parameters:
- name: disableMatrixTrimming
type: boolean
default: false
# sourceBuildPipelineRunId should be overridden when skipping a build to run
# tests or publish images that were produced in a different pipeline run.
- name: sourceBuildPipelineRunId
type: string
default: ""

variables:
- template: /eng/common/templates/variables/dotnet/build-test-publish.yml@self
parameters:
sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }}
- name: officialBranches
# comma-delimited list of branch names
value: main
Expand Down
4 changes: 2 additions & 2 deletions src/cbl-mariner/2.0/android/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG ANDROID_SDK_ROOT=/usr/local/android-sdk
ARG ANDROID_NDK_VERSION=23.2.8568313
ARG ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/$ANDROID_NDK_VERSION
FROM mcr.microsoft.com/openjdk/jdk:17-mariner AS android-sdk-download
FROM mcr.microsoft.com/openjdk/jdk:17-mariner-cm2 AS android-sdk-download
ARG ANDROID_SDK_ROOT
ARG ANDROID_NDK_VERSION
ARG ANDROID_NDK_ROOT
Expand Down Expand Up @@ -30,7 +30,7 @@ RUN /usr/local/cmdline-tools/cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_
RUN rm -r ${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/python3/lib/python3.9/site-packages/ \
&& rm -r ${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang-tidy

FROM mcr.microsoft.com/openjdk/jdk:17-mariner
FROM mcr.microsoft.com/openjdk/jdk:17-mariner-cm2
ARG ANDROID_SDK_ROOT
ARG ANDROID_NDK_VERSION
ARG ANDROID_NDK_ROOT
Expand Down