Skip to content

End of life annotation enhancements #138

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
joe-braley wants to merge 19 commits into from
Closed

End of life annotation enhancements #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5086004
init
joe-braley Dec 12, 2025
ee091d2
wip
joe-braley Dec 12, 2025
ab988ae
Wip: correct registry
joe-braley Dec 15, 2025
05db721
add dryrun function
joe-braley Dec 15, 2025
6eeb351
Wip: fix running inline script
joe-braley Dec 15, 2025
26d8d0b
fix AzCLI task
joe-braley Dec 15, 2025
07a48b2
wip: fix formatting
joe-braley Dec 15, 2025
73bbd41
Wip: single to double quotes for object
joe-braley Dec 15, 2025
d2a1e60
Wip: Adjust how we parse manifest json
joe-braley Dec 15, 2025
da91ceb
Wip: condense output using jq
joe-braley Dec 15, 2025
eddff85
Wip: Remove var names from displayname, quotes around bool condition
joe-braley Dec 15, 2025
b97c0d5
Wip: adjust parameter bool
joe-braley Dec 15, 2025
c54e7e6
Wip: remove image from script
joe-braley Dec 15, 2025
81c12e4
refactors
joe-braley Dec 16, 2025
9d82606
fix typo
joe-braley Dec 16, 2025
2ae9c1c
Wip: Adjust order of operations
joe-braley Dec 16, 2025
9c72421
Adjust echo statement
joe-braley Dec 16, 2025
11f3bb6
Wip: rename matrix variable
joe-braley Dec 16, 2025
d6ebb43
wip
joe-braley Dec 16, 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
258 changes: 150 additions & 108 deletions .devops/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,33 @@ trigger:
exclude:
- .devops
- .github/workflows

pr: none

parameters:
- name: organization
type: string
- name: feed
type: string
- name: package
- name: az_package
type: string
displayName: "Oras package name"
- name: dryrun
displayName: "Execute a dry run?"
type: boolean
default: false
- name: jobs
type: object
default:
azurelinux_8:
new_LTS_image: false
hasExistingImages: true
distro: azurelinux
version: 8
package: temurin-8
image: "image-repository"
tag: "3.0"
distroless_8:
new_LTS_image: false
hasExistingImages: true
distro: distroless
version: 8
package: temurin-8
Expand All @@ -42,21 +48,21 @@ parameters:
base_image: "image-repository"
base_tag: "3.0"
ubuntu_11:
new_LTS_image: false
hasExistingImages: true
distro: ubuntu
version: 11
package: msopenjdk-11
image: "image-repository"
tag: "image-tag"
azurelinux_11:
new_LTS_image: false
hasExistingImages: true
distro: azurelinux
version: 11
package: msopenjdk-11
image: "image-repository"
tag: "3.0"
distroless_11:
new_LTS_image: false
hasExistingImages: true
distro: distroless
version: 11
package: msopenjdk-11
Expand All @@ -65,21 +71,21 @@ parameters:
base_image: "image-repository"
base_tag: "3.0"
ubuntu_17:
new_LTS_image: false
hasExistingImages: true
distro: ubuntu
version: 17
package: msopenjdk-17
image: "image-repository"
tag: "image-tag"
azurelinux_17:
new_LTS_image: false
hasExistingImages: true
distro: azurelinux
version: 17
package: msopenjdk-17
image: "image-repository"
tag: "3.0"
distroless_17:
new_LTS_image: false
hasExistingImages: true
distro: distroless
version: 17
package: msopenjdk-17
Expand All @@ -88,21 +94,21 @@ parameters:
base_image: "image-repository"
base_tag: "3.0"
ubuntu_21:
new_LTS_image: false
hasExistingImages: true
distro: ubuntu
version: 21
package: msopenjdk-21
image: "image-repository"
tag: "image-tag"
azurelinux_21:
new_LTS_image: false
hasExistingImages: true
distro: azurelinux
version: 21
package: msopenjdk-21
image: "image-repository"
tag: "3.0"
distroless_21:
new_LTS_image: false
hasExistingImages: true
distro: distroless
version: 21
package: msopenjdk-21
Expand All @@ -127,70 +133,70 @@ extends:
os: windows
stages:
- stage: build_internal
displayName: "Build Internal"
displayName: Build Internal
variables:
ACR_NAME: msopenjdk
jobs:
- job: build_internal
displayName: "build internal"
pool:
name: JEG-azurelinux-x64-release
os: linux
strategy:
matrix: ${{ parameters.jobs }}
steps:
- task: AzureCLI@2
displayName: "Download ORAS"
condition: ne( variables['new_LTS_image'], true)
inputs:
azureSubscription: "JEG-Infrastructure"
scriptType: "bash"
scriptLocation: "scriptPath"
scriptPath: $(Build.SourcesDirectory)/scripts/install-oras.sh
env:
AZURE_DEVOPS_EXT_PAT: $(System.AccessToken)
ORAS_VERSION: 1.1.0
ORGANIZATION: ${{ parameters.organization }}
FEED: ${{ parameters.feed }}
NAME: ${{ parameters.package }}
- template: /.devops/templates/prepare-annotation.yml@self
parameters:
registry: $(INTERNAL_ACR_REGISTRY)
tag: $(version)-$(distro)

- bash: |
REGISTRIES=msopenjdk.azurecr.io/internal/private/openjdk/jdk:$(version)-$(distro)
REGISTRIES=$(INTERNAL_ACR_REGISTRY):$(version)-$(distro)
if [[ "$(distro)" == "azurelinux" ]]; then
REGISTRIES+=";msopenjdk.azurecr.io/internal/private/openjdk/jdk:$(version)-mariner"
REGISTRIES+=";$(INTERNAL_ACR_REGISTRY):$(version)-mariner"
fi
echo "##vso[task.setvariable variable=REGISTRIES]$REGISTRIES"
displayName: Set REGISTRIES variable

- task: AzureCLI@2
displayName: Annotate previous image
condition: ne( variables['new_LTS_image'], true)
inputs:
azureSubscription: "JEG-Infrastructure"
scriptType: "bash"
scriptLocation: "scriptPath"
scriptPath: $(Build.SourcesDirectory)/scripts/image-annotation.sh
env:
ACR_NAME: msopenjdk
REGISTRIES: $(REGISTRIES)
- task: AzureCLI@2
inputs:
azureSubscription: "JEG-Infrastructure"
scriptType: "bash"
scriptLocation: "scriptPath"
scriptPath: $(Build.SourcesDirectory)/scripts/build-image.sh
displayName: build image
env:
REGISTRY_TAGS: $(REGISTRIES)
IMAGE: $(image)
TAG: $(tag)
PACKAGE: $(package)
DISTRIBUTION: $(distro)
INSTALLER_IMAGE: $(installer_image)
INSTALLER_TAG: $(installer_tag)
${{ if eq(parameters.dryrun, true) }}:
arguments: >
--image $(image)
--tag $(tag)
--package $(package)
--distribution $(distro)
--registries $(REGISTRIES)
--installer-image $(installer_image)
--installer-tag $(installer_tag)
--dryrun
${{ else }}:
arguments: >
--image $(image)
--tag $(tag)
--package $(package)
--distribution $(distro)
--registries $(REGISTRIES)
--installer-image $(installer_image)
--installer-tag $(installer_tag)
displayName: build container image

- template: /.devops/templates/annotate-image.yml@self
parameters:
registry: $(INTERNAL_ACR_REGISTRY)
organization: ${{ parameters.organization }}
feed: ${{ parameters.feed }}
package: ${{ parameters.az_package }}
dryrun: ${{ parameters.dryrun }}

- stage: validate_and_publish
displayName: "Validate & Publish"
dependsOn: build_internal
jobs:

- job: wait_for_validation
displayName: wait for validation
pool: server
Expand All @@ -203,81 +209,117 @@ extends:
onTimeout: "resume"

- job: build_public
displayName: "build public "
dependsOn: wait_for_validation
pool:
name: JEG-azurelinux-x64-release
os: linux
strategy:
matrix: ${{ parameters.jobs }}
steps:
- task: AzureCLI@2
displayName: "Download ORAS"
condition: ne( variables['new_LTS_image'], true)
inputs:
azureSubscription: "JEG-Infrastructure"
scriptType: "bash"
scriptLocation: "scriptPath"
scriptPath: $(Build.SourcesDirectory)/scripts/install-oras.sh
env:
AZURE_DEVOPS_EXT_PAT: $(System.AccessToken)
ORAS_VERSION: 1.1.0
ORGANIZATION: ${{ parameters.organization }}
FEED: ${{ parameters.feed }}
NAME: ${{ parameters.package }}
- template: /.devops/templates/prepare-annotation.yml@self
parameters:
registry: $(ACR_REGISTRY)
tag: $(version)-$(distro)

- bash: |
REGISTRIES=msopenjdk.azurecr.io/public/openjdk/jdk:$(version)-$(distro)
TAGS="$(version)-$(distro)"
REGISTRIES=$(ACR_REGISTRY):$(version)-$(distro)
if [[ "$(distro)" == "azurelinux" ]]; then
REGISTRIES+=";msopenjdk.azurecr.io/public/openjdk/jdk:$(version)-mariner"
REGISTRIES+=";$(ACR_REGISTRY):$(version)-mariner"
fi
echo "##vso[task.setvariable variable=REGISTRIES]$REGISTRIES"
echo "##vso[task.setvariable variable=TAGS]$TAGS"
displayName: Set environment variables
displayName: Set REGISTRIES variable

- task: AzureCLI@2
displayName: Annotate previous image
condition: ne( variables['new_LTS_image'], true)
inputs:
azureSubscription: "JEG-Infrastructure"
scriptType: "bash"
scriptLocation: "scriptPath"
scriptPath: $(Build.SourcesDirectory)/scripts/image-annotation.sh
env:
ACR_NAME: msopenjdk
REGISTRIES: $(REGISTRIES)
scriptPath: $(Build.SourcesDirectory)/scripts/build-image.sh
${{ if eq(parameters.dryrun, true) }}:
arguments: >
--image $(image)
--tag $(tag)
--package $(package)
--distribution $(distro)
--registries $(REGISTRIES)
--installer-image $(installer_image)
--installer-tag $(installer_tag)
--dryrun
${{ else }}:
arguments: >
--image $(image)
--tag $(tag)
--package $(package)
--distribution $(distro)
--registries $(REGISTRIES)
--installer-image $(installer_image)
--installer-tag $(installer_tag)
displayName: build container image

- task: AzureCLI@2
inputs:
azureSubscription: "JEG-Infrastructure"
scriptType: "bash"
scriptLocation: "scriptPath"
scriptPath: scripts/build-image.sh
displayName: build image
env:
REGISTRY_TAGS: $(REGISTRIES)
IMAGE: $(image)
TAG: $(tag)
PACKAGE: $(package)
DISTRIBUTION: $(distro)
INSTALLER_IMAGE: $(installer_image)
INSTALLER_TAG: $(installer_tag)
- template: /.devops/templates/annotate-image.yml@self
parameters:
registry: $(ACR_REGISTRY)
organization: ${{ parameters.organization }}
feed: ${{ parameters.feed }}
package: ${{ parameters.az_package }}
dryrun: ${{ parameters.dryrun }}

- task: AzureCLI@2
displayName: Trigger image signing
env:
AZURE_DEVOPS_EXT_PAT: $(System.AccessToken)
inputs:
azureSubscription: "JEG-Infrastructure"
scriptType: "bash"
scriptLocation: "inlineScript"
inlineScript: |
az pipelines run \
--branch main \
--org ${{ parameters.organization }} \
--project $(OPENJDK_PROJECT) \
--id $(OPENJDK_SIGNING_ID) \
--parameters openjdk_tags="[$(TAGS)]" \
image_registry="msopenjdk.azurecr.io/public/openjdk" \
image_name="jdk"
# - template: /.devops/templates/annotate-image.yml@self
# parameters:
# registry: $(INTERNAL_ACR_REGISTRY)
# tag: $(version)-$(distro)
# organization: ${{ parameters.organization }}
# feed: ${{ parameters.feed }}
# package: ${{ parameters.az_package }}
# dryrun: ${{ parameters.dryrun }}

# - bash: |
# REGISTRIES=$(ACR_REGISTRY):$(version)-$(distro)
# TAGS="$(version)-$(distro)"

# if [[ "$(distro)" == "azurelinux" ]]; then
# REGISTRIES+=";$(ACR_REGISTRY):$(version)-mariner"
# fi

# echo "##vso[task.setvariable variable=REGISTRIES]$REGISTRIES"
# echo "##vso[task.setvariable variable=TAGS]$TAGS"
# displayName: Set environment variables

# - task: AzureCLI@2
# inputs:
# azureSubscription: "JEG-Infrastructure"
# scriptType: "bash"
# scriptLocation: "scriptPath"
# scriptPath: scripts/build-image.sh
# displayName: Build image
# env:
# REGISTRY_TAGS: $(REGISTRIES)
# IMAGE: $(image)
# TAG: $(tag)
# PACKAGE: $(package)
# DISTRIBUTION: $(distro)
# INSTALLER_IMAGE: $(installer_image)
# INSTALLER_TAG: $(installer_tag)
# ${{ if eq(parameters.dryrun, true) }}:
# DRYRUN: "true"
# ${{ else }}:
# DRYRUN: "false"

- ${{ if ne(parameters.dryrun, true) }}:
- task: AzureCLI@2
displayName: Trigger signing
env:
AZURE_DEVOPS_EXT_PAT: $(System.AccessToken)
inputs:
azureSubscription: "JEG-Infrastructure"
scriptType: "bash"
scriptLocation: "inlineScript"
inlineScript: |
az pipelines run \
--branch main \
--org ${{ parameters.organization }} \
--project $(OPENJDK_PROJECT) \
--id $(OPENJDK_SIGNING_ID) \
--parameters openjdk_tags="[$(TAGS)]" \
image_registry="$(ACR_REGISTRY)" \
image_name="jdk"
Loading
Loading