From 8ec051bd96475c22e092a35057d1827d9df290aa Mon Sep 17 00:00:00 2001 From: Joseph Knierman Date: Tue, 16 Aug 2022 10:23:11 -0700 Subject: [PATCH 01/10] copy iis logs to artifacts --- builds/misc/templates/build-packages.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/builds/misc/templates/build-packages.yaml b/builds/misc/templates/build-packages.yaml index d8bc9b28ca1..9f42077a5fc 100644 --- a/builds/misc/templates/build-packages.yaml +++ b/builds/misc/templates/build-packages.yaml @@ -321,6 +321,15 @@ stages: popd sudo cp iot-identity-service/packages/mariner$(os_version)/$(arch)/aziot-identity-service-$packageVersion-1.cm$(os_version).$(arch).rpm . sudo rm -rf iot-identity-service + + - task: CopyFiles@2 + displayName: Copy iot-identity-service build logs to artifact staging + inputs: + SourceFolder: 'iot-identity-service/Mariner-Build/build/logs/pkggen/rpmbuilding' + Contents: | + **/*.rpm.log + TargetFolder: '$(build.artifactstagingdirectory)' + condition: succeededOrFailed() - bash: | sudo docker run --rm \ From 1359609e5337b8bcafa974f096cfc61ca507465a Mon Sep 17 00:00:00 2001 From: Joseph Knierman Date: Tue, 16 Aug 2022 11:09:37 -0700 Subject: [PATCH 02/10] add step to copy and remove iis files --- builds/misc/templates/build-packages.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/builds/misc/templates/build-packages.yaml b/builds/misc/templates/build-packages.yaml index 9f42077a5fc..5ec03e9be86 100644 --- a/builds/misc/templates/build-packages.yaml +++ b/builds/misc/templates/build-packages.yaml @@ -320,18 +320,22 @@ stages: '/src/ci/package.sh' popd sudo cp iot-identity-service/packages/mariner$(os_version)/$(arch)/aziot-identity-service-$packageVersion-1.cm$(os_version).$(arch).rpm . - sudo rm -rf iot-identity-service - task: CopyFiles@2 displayName: Copy iot-identity-service build logs to artifact staging inputs: - SourceFolder: 'iot-identity-service/Mariner-Build/build/logs/pkggen/rpmbuilding' + SourceFolder: 'iot-identity-service/Mariner-Build/build/logs/pkggen/rpmbuilding/' Contents: | **/*.rpm.log TargetFolder: '$(build.artifactstagingdirectory)' condition: succeededOrFailed() - - - bash: | + + - task: DeleteFiles@1 + inputs: + Contents: iot-identity-service + displayName: Remove iot-identity-service directory + + - bash: sudo docker run --rm \ -v "$(Build.SourcesDirectory):/src" \ -e "ARCH=$arch" \ From 0dba71437cc2627e3d71387af9ded6b3c397aace Mon Sep 17 00:00:00 2001 From: Joseph Knierman Date: Tue, 16 Aug 2022 11:10:13 -0700 Subject: [PATCH 03/10] prevent other builds --- builds/misc/templates/build-packages.yaml | 400 +++++++++++----------- 1 file changed, 200 insertions(+), 200 deletions(-) diff --git a/builds/misc/templates/build-packages.yaml b/builds/misc/templates/build-packages.yaml index 5ec03e9be86..36df5183805 100644 --- a/builds/misc/templates/build-packages.yaml +++ b/builds/misc/templates/build-packages.yaml @@ -27,211 +27,211 @@ stages: displayName: Check changes in edgelet sources name: check_files -################################################################################ - - stage: BuildPackages -################################################################################ - displayName: Build Packages - condition: | - or - ( - eq(${{ parameters['E2EBuild'] }}, false), - eq(dependencies.CheckBuildPackages.outputs['check_source_change_edgelet.check_files.EDGELETCHANGES'], 'true') - ) - pool: - name: $(pool.linux.name) - demands: - - ImageOverride -equals agent-aziotedge-ubuntu-20.04-docker - dependsOn: CheckBuildPackages - jobs: - - job: linux - displayName: Linux - pool: - name: $(pool.linux.name) - demands: - - ImageOverride -equals agent-aziotedge-ubuntu-20.04-docker - strategy: - matrix: - Centos75-amd64: - arch: amd64 - os: centos7 - target.iotedged: edgelet/target/rpmbuild/RPMS/x86_64 - RedHat8-amd64: - arch: amd64 - os: redhat8 - target.iotedged: edgelet/target/rpmbuild/RPMS/x86_64 +# ################################################################################ +# - stage: BuildPackages +# ################################################################################ +# displayName: Build Packages +# condition: | +# or +# ( +# eq(${{ parameters['E2EBuild'] }}, false), +# eq(dependencies.CheckBuildPackages.outputs['check_source_change_edgelet.check_files.EDGELETCHANGES'], 'true') +# ) +# pool: +# name: $(pool.linux.name) +# demands: +# - ImageOverride -equals agent-aziotedge-ubuntu-20.04-docker +# dependsOn: CheckBuildPackages +# jobs: +# - job: linux +# displayName: Linux +# pool: +# name: $(pool.linux.name) +# demands: +# - ImageOverride -equals agent-aziotedge-ubuntu-20.04-docker +# strategy: +# matrix: +# Centos75-amd64: +# arch: amd64 +# os: centos7 +# target.iotedged: edgelet/target/rpmbuild/RPMS/x86_64 +# RedHat8-amd64: +# arch: amd64 +# os: redhat8 +# target.iotedged: edgelet/target/rpmbuild/RPMS/x86_64 - Debian10-amd64: - os: debian10 - arch: amd64 - target.iotedged: edgelet/target/release - Debian10-arm32v7: - os: debian10 - arch: arm32v7 - target.iotedged: edgelet/target/armv7-unknown-linux-gnueabihf/release - Debian10-aarch64: - os: debian10 - arch: aarch64 - target.iotedged: edgelet/target/aarch64-unknown-linux-gnu/release +# Debian10-amd64: +# os: debian10 +# arch: amd64 +# target.iotedged: edgelet/target/release +# Debian10-arm32v7: +# os: debian10 +# arch: arm32v7 +# target.iotedged: edgelet/target/armv7-unknown-linux-gnueabihf/release +# Debian10-aarch64: +# os: debian10 +# arch: aarch64 +# target.iotedged: edgelet/target/aarch64-unknown-linux-gnu/release - Debian11-amd64: - os: debian11 - arch: amd64 - target.iotedged: edgelet/target/release - Debian11-arm32v7: - os: debian11 - arch: arm32v7 - target.iotedged: edgelet/target/armv7-unknown-linux-gnueabihf/release - Debian11-aarch64: - os: debian11 - arch: aarch64 - target.iotedged: edgelet/target/aarch64-unknown-linux-gnu/release +# Debian11-amd64: +# os: debian11 +# arch: amd64 +# target.iotedged: edgelet/target/release +# Debian11-arm32v7: +# os: debian11 +# arch: arm32v7 +# target.iotedged: edgelet/target/armv7-unknown-linux-gnueabihf/release +# Debian11-aarch64: +# os: debian11 +# arch: aarch64 +# target.iotedged: edgelet/target/aarch64-unknown-linux-gnu/release - Ubuntu1804-amd64: - os: ubuntu18.04 - arch: amd64 - target.iotedged: edgelet/target/release - Ubuntu1804-arm32v7: - os: ubuntu18.04 - arch: arm32v7 - target.iotedged: edgelet/target/armv7-unknown-linux-gnueabihf/release - Ubuntu1804-aarch64: - os: ubuntu18.04 - arch: aarch64 - target.iotedged: edgelet/target/aarch64-unknown-linux-gnu/release - Ubuntu2004-amd64: - arch: amd64 - os: ubuntu20.04 - target.iotedged: edgelet/target/release - Ubuntu2004-arm32v7: - arch: arm32v7 - os: ubuntu20.04 - target.iotedged: edgelet/target/armv7-unknown-linux-gnueabihf/release - Ubuntu2004-aarch64: - arch: aarch64 - os: ubuntu20.04 - target.iotedged: edgelet/target/aarch64-unknown-linux-gnu/release - steps: - - bash: | - BASE_VERSION=`cat $BUILD_SOURCESDIRECTORY/edgelet/version.txt` - VERSION="$BASE_VERSION$BUILD_BUILDNUMBER" - echo "Version: $VERSION" - echo "##vso[task.setvariable variable=VERSION;]$VERSION" +# Ubuntu1804-amd64: +# os: ubuntu18.04 +# arch: amd64 +# target.iotedged: edgelet/target/release +# Ubuntu1804-arm32v7: +# os: ubuntu18.04 +# arch: arm32v7 +# target.iotedged: edgelet/target/armv7-unknown-linux-gnueabihf/release +# Ubuntu1804-aarch64: +# os: ubuntu18.04 +# arch: aarch64 +# target.iotedged: edgelet/target/aarch64-unknown-linux-gnu/release +# Ubuntu2004-amd64: +# arch: amd64 +# os: ubuntu20.04 +# target.iotedged: edgelet/target/release +# Ubuntu2004-arm32v7: +# arch: arm32v7 +# os: ubuntu20.04 +# target.iotedged: edgelet/target/armv7-unknown-linux-gnueabihf/release +# Ubuntu2004-aarch64: +# arch: aarch64 +# os: ubuntu20.04 +# target.iotedged: edgelet/target/aarch64-unknown-linux-gnu/release +# steps: +# - bash: | +# BASE_VERSION=`cat $BUILD_SOURCESDIRECTORY/edgelet/version.txt` +# VERSION="$BASE_VERSION$BUILD_BUILDNUMBER" +# echo "Version: $VERSION" +# echo "##vso[task.setvariable variable=VERSION;]$VERSION" - echo "##vso[task.setvariable variable=PACKAGE_ARCH;]$(arch)" - echo "##vso[task.setvariable variable=PACKAGE_OS;]$(os)" - displayName: Set Version - condition: or(eq(${{ parameters['E2EBuild'] }}, false), eq(variables.arch,'amd64')) - - script: edgelet/build/linux/package.sh - displayName: Create aziot-edge packages - condition: or(eq(${{ parameters['E2EBuild'] }}, false), eq(variables.arch,'amd64')) - - task: CopyFiles@2 - displayName: Copy aziot-edge Files to Artifact Staging - condition: or(eq(${{ parameters['E2EBuild'] }}, false), eq(variables.arch,'amd64')) - inputs: - SourceFolder: $(target.iotedged) - Contents: | - *.deb - *.rpm - TargetFolder: '$(build.artifactstagingdirectory)' - - task: PublishBuildArtifacts@1 - displayName: Publish Artifacts - inputs: - PathtoPublish: '$(build.artifactstagingdirectory)' - ArtifactName: 'iotedged-$(os)-$(arch)' - condition: and(succeededOrFailed(), or(eq(${{ parameters['E2EBuild'] }}, false), eq(variables.arch,'amd64'))) +# echo "##vso[task.setvariable variable=PACKAGE_ARCH;]$(arch)" +# echo "##vso[task.setvariable variable=PACKAGE_OS;]$(os)" +# displayName: Set Version +# condition: or(eq(${{ parameters['E2EBuild'] }}, false), eq(variables.arch,'amd64')) +# - script: edgelet/build/linux/package.sh +# displayName: Create aziot-edge packages +# condition: or(eq(${{ parameters['E2EBuild'] }}, false), eq(variables.arch,'amd64')) +# - task: CopyFiles@2 +# displayName: Copy aziot-edge Files to Artifact Staging +# condition: or(eq(${{ parameters['E2EBuild'] }}, false), eq(variables.arch,'amd64')) +# inputs: +# SourceFolder: $(target.iotedged) +# Contents: | +# *.deb +# *.rpm +# TargetFolder: '$(build.artifactstagingdirectory)' +# - task: PublishBuildArtifacts@1 +# displayName: Publish Artifacts +# inputs: +# PathtoPublish: '$(build.artifactstagingdirectory)' +# ArtifactName: 'iotedged-$(os)-$(arch)' +# condition: and(succeededOrFailed(), or(eq(${{ parameters['E2EBuild'] }}, false), eq(variables.arch,'amd64'))) - ################################################################################ - - job: mariner_linux - ################################################################################ - displayName: Mariner_Linux - condition: or(eq(variables['build.linux.mariner'], ''), eq(variables['build.linux.mariner'], true)) - pool: - # We are using Linux image that lives in Windows pool. The Windows pool by default uses Standard_D4s_v3 SKU. - # EFLOW requires ~85GB to build the edgelet artifacts. - name: $(pool.windows.name) - demands: - - ImageOverride -equals agent-aziotedge-ubuntu-20.04-docker-large-disk - strategy: - matrix: - CBL-Mariner1.0-amd64: - arch: amd64 - os: mariner - os_version: 1 - mariner_release: 1.0-stable - target.iotedged: builds/mariner1/out/RPMS - target.logs: builds/mariner1/build/logs/pkggen/rpmbuilding/ - CBL-Mariner2.0-amd64: - arch: amd64 - os: mariner - os_version: 2 - # mariner_release: 2.0-stable - # WARN: 2.0-stable is broken - https://github.com/microsoft/CBL-Mariner/issues/3483 - mariner_release: 2.0.20220713-2.0 - target.iotedged: builds/mariner2/out/RPMS - target.logs: builds/mariner2/build/logs/pkggen/rpmbuilding/ - steps: - - bash: | - BASE_VERSION=`cat $BUILD_SOURCESDIRECTORY/edgelet/version.txt` - VERSION="$BASE_VERSION$BUILD_BUILDNUMBER" - echo "##vso[task.setvariable variable=VERSION;]$VERSION" - echo "##vso[task.setvariable variable=PACKAGE_ARCH;]$(arch)" - echo "PACKAGE_OS=$(os)" - echo "##vso[task.setvariable variable=MARINER_RELEASE;]$(mariner_release)" - mariner_arch=$(arch) - if [ $mariner_arch == "amd64" ]; then - mariner_arch="x86_64" - fi - echo "##vso[task.setvariable variable=MARINER_ARCH;]$mariner_arch" - displayName: Set Version - - task: AzureKeyVault@1 - displayName: 'Azure Key Vault: EdgeBuildkv' - inputs: - azureSubscription: $(az.subscription) - KeyVaultName: 'edgebuildkv' - SecretsFilter: >- - IotEdge1-GitHub-PAT - - task: PowerShell@2 - displayName: 'Download aziot-identity-service' - inputs: - filePath: scripts/local/test/DownloadIdentityService.ps1 - env: - GITHUB_TOKEN: $(IotEdge1-GitHub-PAT) - ARTIFACT_NAME: 'packages_$(os)-$(os_version)_$(arch)' - PACKAGE_FILTER: 'aziot-identity-service-*.cm$(os_version).$(MARINER_ARCH).rpm' - DOWNLOAD_PATH: $(Build.SourcesDirectory) - - bash: | - docker run --rm \ - -v "$(Build.SourcesDirectory):/src" \ - -e "ARCH=$arch" \ - -e "OS=$OS" \ - -e "MARINER_RELEASE=$MARINER_RELEASE" \ - -e "MARINER_ARCH=$MARINER_ARCH" \ - -e "VERSION=$VERSION" \ - --privileged \ - "ubuntu:18.04" \ - '/src/edgelet/build/linux/package-mariner.sh' - - task: CopyFiles@2 - displayName: Copy iotedged build logs to artifact staging - inputs: - SourceFolder: $(target.logs) - Contents: | - **/*.rpm.log - TargetFolder: '$(build.artifactstagingdirectory)' - condition: succeededOrFailed() - - task: CopyFiles@2 - displayName: Copy iotedged Files to Artifact Staging - inputs: - SourceFolder: $(target.iotedged)/$(mariner_arch) - Contents: | - aziot-edge-*.rpm - TargetFolder: '$(build.artifactstagingdirectory)' - condition: succeededOrFailed() - - task: PublishBuildArtifacts@1 - displayName: Publish Artifacts - inputs: - PathtoPublish: '$(build.artifactstagingdirectory)' - ArtifactName: 'iotedged-$(os)$(os_version)-$(arch)' - condition: succeededOrFailed() +# ################################################################################ +# - job: mariner_linux +# ################################################################################ +# displayName: Mariner_Linux +# condition: or(eq(variables['build.linux.mariner'], ''), eq(variables['build.linux.mariner'], true)) +# pool: +# # We are using Linux image that lives in Windows pool. The Windows pool by default uses Standard_D4s_v3 SKU. +# # EFLOW requires ~85GB to build the edgelet artifacts. +# name: $(pool.windows.name) +# demands: +# - ImageOverride -equals agent-aziotedge-ubuntu-20.04-docker-large-disk +# strategy: +# matrix: +# CBL-Mariner1.0-amd64: +# arch: amd64 +# os: mariner +# os_version: 1 +# mariner_release: 1.0-stable +# target.iotedged: builds/mariner1/out/RPMS +# target.logs: builds/mariner1/build/logs/pkggen/rpmbuilding/ +# CBL-Mariner2.0-amd64: +# arch: amd64 +# os: mariner +# os_version: 2 +# # mariner_release: 2.0-stable +# # WARN: 2.0-stable is broken - https://github.com/microsoft/CBL-Mariner/issues/3483 +# mariner_release: 2.0.20220713-2.0 +# target.iotedged: builds/mariner2/out/RPMS +# target.logs: builds/mariner2/build/logs/pkggen/rpmbuilding/ +# steps: +# - bash: | +# BASE_VERSION=`cat $BUILD_SOURCESDIRECTORY/edgelet/version.txt` +# VERSION="$BASE_VERSION$BUILD_BUILDNUMBER" +# echo "##vso[task.setvariable variable=VERSION;]$VERSION" +# echo "##vso[task.setvariable variable=PACKAGE_ARCH;]$(arch)" +# echo "PACKAGE_OS=$(os)" +# echo "##vso[task.setvariable variable=MARINER_RELEASE;]$(mariner_release)" +# mariner_arch=$(arch) +# if [ $mariner_arch == "amd64" ]; then +# mariner_arch="x86_64" +# fi +# echo "##vso[task.setvariable variable=MARINER_ARCH;]$mariner_arch" +# displayName: Set Version +# - task: AzureKeyVault@1 +# displayName: 'Azure Key Vault: EdgeBuildkv' +# inputs: +# azureSubscription: $(az.subscription) +# KeyVaultName: 'edgebuildkv' +# SecretsFilter: >- +# IotEdge1-GitHub-PAT +# - task: PowerShell@2 +# displayName: 'Download aziot-identity-service' +# inputs: +# filePath: scripts/local/test/DownloadIdentityService.ps1 +# env: +# GITHUB_TOKEN: $(IotEdge1-GitHub-PAT) +# ARTIFACT_NAME: 'packages_$(os)-$(os_version)_$(arch)' +# PACKAGE_FILTER: 'aziot-identity-service-*.cm$(os_version).$(MARINER_ARCH).rpm' +# DOWNLOAD_PATH: $(Build.SourcesDirectory) +# - bash: | +# docker run --rm \ +# -v "$(Build.SourcesDirectory):/src" \ +# -e "ARCH=$arch" \ +# -e "OS=$OS" \ +# -e "MARINER_RELEASE=$MARINER_RELEASE" \ +# -e "MARINER_ARCH=$MARINER_ARCH" \ +# -e "VERSION=$VERSION" \ +# --privileged \ +# "ubuntu:18.04" \ +# '/src/edgelet/build/linux/package-mariner.sh' +# - task: CopyFiles@2 +# displayName: Copy iotedged build logs to artifact staging +# inputs: +# SourceFolder: $(target.logs) +# Contents: | +# **/*.rpm.log +# TargetFolder: '$(build.artifactstagingdirectory)' +# condition: succeededOrFailed() +# - task: CopyFiles@2 +# displayName: Copy iotedged Files to Artifact Staging +# inputs: +# SourceFolder: $(target.iotedged)/$(mariner_arch) +# Contents: | +# aziot-edge-*.rpm +# TargetFolder: '$(build.artifactstagingdirectory)' +# condition: succeededOrFailed() +# - task: PublishBuildArtifacts@1 +# displayName: Publish Artifacts +# inputs: +# PathtoPublish: '$(build.artifactstagingdirectory)' +# ArtifactName: 'iotedged-$(os)$(os_version)-$(arch)' +# condition: succeededOrFailed() ################################################################################ - job: mariner_linux_arm64 From 3e33f0655473730db94e6c3293bd6cc804e51649 Mon Sep 17 00:00:00 2001 From: Joseph Knierman Date: Tue, 16 Aug 2022 11:11:34 -0700 Subject: [PATCH 04/10] fixed syntax error --- builds/misc/templates/build-packages.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/builds/misc/templates/build-packages.yaml b/builds/misc/templates/build-packages.yaml index 36df5183805..988235dc40d 100644 --- a/builds/misc/templates/build-packages.yaml +++ b/builds/misc/templates/build-packages.yaml @@ -332,8 +332,9 @@ stages: - task: DeleteFiles@1 inputs: - Contents: iot-identity-service - displayName: Remove iot-identity-service directory + Contents: iot-identity-service + displayName: Remove iot-identity-service directory + condition: succeededOrFailed() - bash: sudo docker run --rm \ From 02c2f3efe4f18e7afe6212d5e5e5eeea90875e77 Mon Sep 17 00:00:00 2001 From: Joseph Knierman Date: Tue, 16 Aug 2022 12:08:18 -0700 Subject: [PATCH 05/10] use sudo to remove files --- builds/misc/templates/build-packages.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/builds/misc/templates/build-packages.yaml b/builds/misc/templates/build-packages.yaml index 988235dc40d..9080cfd1b22 100644 --- a/builds/misc/templates/build-packages.yaml +++ b/builds/misc/templates/build-packages.yaml @@ -320,6 +320,7 @@ stages: '/src/ci/package.sh' popd sudo cp iot-identity-service/packages/mariner$(os_version)/$(arch)/aziot-identity-service-$packageVersion-1.cm$(os_version).$(arch).rpm . + - task: CopyFiles@2 displayName: Copy iot-identity-service build logs to artifact staging @@ -330,11 +331,9 @@ stages: TargetFolder: '$(build.artifactstagingdirectory)' condition: succeededOrFailed() - - task: DeleteFiles@1 - inputs: - Contents: iot-identity-service - displayName: Remove iot-identity-service directory - condition: succeededOrFailed() + - bash: | + sudo rm -rf iot-identity-service + displayName: remove iot-identity-service file - bash: sudo docker run --rm \ From 28fdfd4fa6b374a60a88968ec0d959beadd26a82 Mon Sep 17 00:00:00 2001 From: Joseph Knierman Date: Tue, 16 Aug 2022 12:40:14 -0700 Subject: [PATCH 06/10] point to test iis version --- builds/misc/templates/build-packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builds/misc/templates/build-packages.yaml b/builds/misc/templates/build-packages.yaml index 9080cfd1b22..b96c731d964 100644 --- a/builds/misc/templates/build-packages.yaml +++ b/builds/misc/templates/build-packages.yaml @@ -306,7 +306,7 @@ stages: # build iot-identity-service here since they cannot build native aarch64 packages - bash: | set -ex - git clone --recurse-submodules https://github.com/Azure/iot-identity-service.git + git clone --recurse-submodules https://github.com/josephknierman/iot-identity-service.git -b user/joknierm/change-mariner-toolkit pushd iot-identity-service packageVersion=$(git tag | grep 1.3.[0-9]*$ | sort --version-sort -r | head -1) sudo docker run --rm \ From 3dfd694809ad594bfdc1f482a5b47e14ca528b5e Mon Sep 17 00:00:00 2001 From: Joseph Knierman Date: Tue, 16 Aug 2022 15:56:55 -0700 Subject: [PATCH 07/10] changed back to original package --- builds/misc/templates/build-packages.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builds/misc/templates/build-packages.yaml b/builds/misc/templates/build-packages.yaml index b96c731d964..8e4a7f64c27 100644 --- a/builds/misc/templates/build-packages.yaml +++ b/builds/misc/templates/build-packages.yaml @@ -306,7 +306,7 @@ stages: # build iot-identity-service here since they cannot build native aarch64 packages - bash: | set -ex - git clone --recurse-submodules https://github.com/josephknierman/iot-identity-service.git -b user/joknierm/change-mariner-toolkit + git clone --recurse-submodules https://github.com/iot-identity-service.git pushd iot-identity-service packageVersion=$(git tag | grep 1.3.[0-9]*$ | sort --version-sort -r | head -1) sudo docker run --rm \ @@ -325,7 +325,7 @@ stages: - task: CopyFiles@2 displayName: Copy iot-identity-service build logs to artifact staging inputs: - SourceFolder: 'iot-identity-service/Mariner-Build/build/logs/pkggen/rpmbuilding/' + SourceFolder: 'iot-identity-service/Mariner-Build/build/' Contents: | **/*.rpm.log TargetFolder: '$(build.artifactstagingdirectory)' From 72293c25b0836c51fe1b26836993985e01c4156b Mon Sep 17 00:00:00 2001 From: Joseph Knierman Date: Tue, 16 Aug 2022 16:17:56 -0700 Subject: [PATCH 08/10] changed back to original package --- builds/misc/templates/build-packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builds/misc/templates/build-packages.yaml b/builds/misc/templates/build-packages.yaml index 8e4a7f64c27..45501c100d3 100644 --- a/builds/misc/templates/build-packages.yaml +++ b/builds/misc/templates/build-packages.yaml @@ -306,7 +306,7 @@ stages: # build iot-identity-service here since they cannot build native aarch64 packages - bash: | set -ex - git clone --recurse-submodules https://github.com/iot-identity-service.git + git clone --recurse-submodules https://github.com/Azure/iot-identity-service.git pushd iot-identity-service packageVersion=$(git tag | grep 1.3.[0-9]*$ | sort --version-sort -r | head -1) sudo docker run --rm \ From 3cdc2a8763650dfd20bf8a40addf1942db74f7b6 Mon Sep 17 00:00:00 2001 From: Joseph Knierman Date: Wed, 17 Aug 2022 01:42:15 -0700 Subject: [PATCH 09/10] change to feature branch --- builds/misc/templates/build-packages.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builds/misc/templates/build-packages.yaml b/builds/misc/templates/build-packages.yaml index 45501c100d3..a83fd66e220 100644 --- a/builds/misc/templates/build-packages.yaml +++ b/builds/misc/templates/build-packages.yaml @@ -306,7 +306,7 @@ stages: # build iot-identity-service here since they cannot build native aarch64 packages - bash: | set -ex - git clone --recurse-submodules https://github.com/Azure/iot-identity-service.git + git clone --recurse-submodules https://github.com/josephknierman/iot-identity-service.git -b user/joknierm/change-mariner-toolkit pushd iot-identity-service packageVersion=$(git tag | grep 1.3.[0-9]*$ | sort --version-sort -r | head -1) sudo docker run --rm \ @@ -327,6 +327,7 @@ stages: inputs: SourceFolder: 'iot-identity-service/Mariner-Build/build/' Contents: | + logs/pkggen/rpmbuilding/ **/*.rpm.log TargetFolder: '$(build.artifactstagingdirectory)' condition: succeededOrFailed() From 0039c18a5215ba822b2aa11ec9a9985e50391a24 Mon Sep 17 00:00:00 2001 From: Joseph Knierman Date: Wed, 17 Aug 2022 01:46:55 -0700 Subject: [PATCH 10/10] fixed syntax error --- builds/misc/templates/build-packages.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/builds/misc/templates/build-packages.yaml b/builds/misc/templates/build-packages.yaml index a83fd66e220..b96c731d964 100644 --- a/builds/misc/templates/build-packages.yaml +++ b/builds/misc/templates/build-packages.yaml @@ -325,9 +325,8 @@ stages: - task: CopyFiles@2 displayName: Copy iot-identity-service build logs to artifact staging inputs: - SourceFolder: 'iot-identity-service/Mariner-Build/build/' + SourceFolder: 'iot-identity-service/Mariner-Build/build/logs/pkggen/rpmbuilding/' Contents: | - logs/pkggen/rpmbuilding/ **/*.rpm.log TargetFolder: '$(build.artifactstagingdirectory)' condition: succeededOrFailed()