Skip to content

Commit 6291be8

Browse files
committed
fixup! Edit Pipeline Trigger
1 parent 7683a3f commit 6291be8

File tree

2 files changed

+4
-22
lines changed

2 files changed

+4
-22
lines changed

.pipelines/build/binaries.jobs.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
variables:
1616
ob_outputDirectory: $(Build.ArtifactStagingDirectory)/out
1717
ob_git_checkout: true
18-
ob_artifactSuffix: _$(artifact)_${{ job_data.job }}
18+
ob_artifactSuffix: _$(artifact)
1919
ACN_DIR: azure-container-networking
2020
${{ if eq(job_data.job, 'linux_amd64') }}:
2121
LinuxContainerImage: $(LinuxContainerImage2)
@@ -52,6 +52,7 @@ jobs:
5252
variables:
5353
ob_outputDirectory: $(Build.ArtifactStagingDirectory)/out
5454
ob_artifactSuffix: _$(artifact)_${{ job_data.job }}_signed
55+
ob_artifactSuffix: _$(artifact)_signed
5556
${{ if eq(job_data.job, 'linux_amd64') }}:
5657
LinuxContainerImage: $(LinuxContainerImage2)
5758
ARCH: amd64
@@ -71,11 +72,11 @@ jobs:
7172
- task: DownloadPipelineArtifact@2
7273
inputs:
7374
targetPath: $(Build.ArtifactStagingDirectory)/out
74-
artifact: drop_build_binaries_$(artifact)_${{ job_data.job }}
75+
artifact: drop_build_binaries_${{ job_data.job }}_$(artifact)
7576

7677
- task: onebranch.pipeline.signing@1
7778
inputs:
7879
command: 'sign'
79-
signing_profile: 'internal_azure_service'
80+
signing_profile: 'external_distribution'
8081
files_to_sign: '**/*'
8182
search_root: '$(Build.ArtifactStagingDirectory)/out'

.pipelines/build/image.steps.yaml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ parameters:
4141
default:
4242
- "--target $(os) "
4343
- "--platform $(os)/$(arch) "
44-
- "--provenance false"
4544

4645
- name: common_build_args
4746
type: object
@@ -92,21 +91,3 @@ steps:
9291
arguments: --build-arg ${{ join('--build-arg ', parameters.common_build_args) }} ${{ parameters.extra_args }} ${{ join(' ', parameters.default_args) }}
9392
${{ else }}:
9493
arguments: ${{ parameters.extra_args }} ${{ join(' ', parameters.default_args) }}
95-
96-
97-
- bash: |
98-
IMAGE_FULL_NAME="$IMAGE_PREFIX/$IMAGE_NAME"
99-
echo >&2 "##vso[task.setvariable variable=IMAGE_PLATFORM_TAG;isOutput=true;]$IMAGE_PLATFORM_TAG"
100-
#echo >&2 "##vso[task.setvariable variable=IMAGE_FULL_NAME;isOutput=true;]$IMAGE_FULL_NAME"
101-
echo >&2 "##vso[task.setvariable variable=IMAGE_REFERENCE;isOutput=true;]$IMAGE_REPO/$IMAGE_FULL_NAME:$IMAGE_PLATFORM_TAG"
102-
#echo >&2 "##vso[task.setvariable variable=IMAGE_ARTIFACT_METADATA_PATH;isOutput=true;]$METADATA_FILE"
103-
#echo >&2 "##vso[task.setvariable variable=IMAGE_ARTIFACT_TAR_PATH;isOutput=true;]$IMAGE_TAR_PATH"
104-
displayName: "Output Image Details"
105-
name: detail
106-
env:
107-
IMAGE_NAME: $(os)-$(arch)/${{ parameters.name }}
108-
IMAGE_PREFIX: 'artifact/dd590928-4e04-48cb-9d3d-ee06c5f0e17f/buddy'
109-
IMAGE_PLATFORM_TAG: '${{ parameters.build_tag }}'
110-
IMAGE_REPO: $(ACN)
111-
METADATA_FILE: images/$(os)-$(arch)/metadata/${{ parameters.archive_file }}-metadata.json
112-
IMAGE_TAR_PATH: images/$(os)-$(arch)/${{ parameters.archive_file }}.tar.gz

0 commit comments

Comments
 (0)