Skip to content

Commit 13ef062

Browse files
jason1028krjason1028kr
committed
test: skip build
1 parent 0cb8c38 commit 13ef062

File tree

3 files changed

+41
-20
lines changed

3 files changed

+41
-20
lines changed

‎.pipelines/templates/.builder-release-template.yaml

+19-19
Original file line numberDiff line numberDiff line change
@@ -111,35 +111,35 @@ steps:
111111
echo "##vso[task.setvariable variable=SKU_NAME]$SKU_NAME"
112112
echo "Set SKU_NAME to $SKU_NAME"
113113
displayName: Set SKU Name
114-
- bash: make -f packer.mk run-packer
115-
displayName: Build VHD
116-
retryCountOnTaskFailure: 3
117-
env:
118-
OS_TYPE: Linux
119-
GIT_VERSION: $(Build.SourceVersion)
120-
BRANCH: $(Build.SourceBranch)
121-
BUILD_NUMBER: $(Build.BuildNumber)
122-
BUILD_ID: $(Build.BuildId)
123-
BUILD_DEFINITION_NAME: $(Build.DefinitionName)
124-
UA_TOKEN: $(ua-token)
114+
# - bash: make -f packer.mk run-packer
115+
# displayName: Build VHD
116+
# retryCountOnTaskFailure: 3
117+
# env:
118+
# OS_TYPE: Linux
119+
# GIT_VERSION: $(Build.SourceVersion)
120+
# BRANCH: $(Build.SourceBranch)
121+
# BUILD_NUMBER: $(Build.BuildNumber)
122+
# BUILD_ID: $(Build.BuildId)
123+
# BUILD_DEFINITION_NAME: $(Build.DefinitionName)
124+
# UA_TOKEN: $(ua-token)
125125

126126
- bash: |
127-
PACKER_VNET_RESOURCE_GROUP_NAME="$(cat vhdbuilder/packer/settings.json | grep "vnet_resource_group_name" | awk -F':' '{print $2}' | awk -F'"' '{print $2}')" && \
128-
PACKER_VNET_NAME="$(cat vhdbuilder/packer/settings.json | grep "vnet_name" | awk -F':' '{print $2}' | awk -F'"' '{print $2}')" && \
129-
CAPTURED_SIG_VERSION="$(cat vhdbuilder/packer/settings.json | grep "captured_sig_version" | awk -F':' '{print $2}' | awk -F'"' '{print $2}')" && \
130-
SIG_IMAGE_NAME="$(cat vhdbuilder/packer/settings.json | grep "sig_image_name" | awk -F':' '{print $2}' | awk -F'"' '{print $2}')" && \
127+
PACKER_VNET_RESOURCE_GROUP_NAME="nodesig-test-westus2-packer-vnet-rg" && \
128+
PACKER_VNET_NAME="nodesig-packer-vnet-westus2" && \
129+
CAPTURED_SIG_VERSION="1.1738120749.14404" && \
130+
SIG_IMAGE_NAME="2204containerd" && \
131131
echo "##vso[task.setvariable variable=PACKER_VNET_RESOURCE_GROUP_NAME]${PACKER_VNET_RESOURCE_GROUP_NAME}" && \
132132
echo "##vso[task.setvariable variable=PACKER_VNET_NAME]${PACKER_VNET_NAME}" && \
133133
echo "##vso[task.setvariable variable=VHD_NAME]${CAPTURED_SIG_VERSION}.vhd" && \
134134
echo "##vso[task.setvariable variable=IMAGE_NAME]${SIG_IMAGE_NAME}-${CAPTURED_SIG_VERSION}" && \
135135
echo "##vso[task.setvariable variable=SIG_IMAGE_NAME]${SIG_IMAGE_NAME}" && \
136136
echo "##vso[task.setvariable variable=CAPTURED_SIG_VERSION]${CAPTURED_SIG_VERSION}" && \
137137
echo "##vso[task.setvariable variable=IMPORTED_IMAGE_NAME]$(cat vhdbuilder/packer/settings.json | grep "imported_image_name" | awk -F':' '{print $2}' | awk -F'"' '{print $2}')" && \
138-
echo "##vso[task.setvariable variable=OS_DISK_URI]$(cat packer-output | grep "OSDiskUri:" | cut -d " " -f 2)" && \
139-
echo "##vso[task.setvariable variable=MANAGED_SIG_ID]$(cat packer-output | grep "ManagedImageSharedImageGalleryId:" | cut -d " " -f 2)" && \
140-
echo "##vso[task.setvariable variable=SIG_GALLERY_NAME]$(cat vhdbuilder/packer/settings.json | grep "sig_gallery_name" | awk -F':' '{print $2}' | awk -F'"' '{print $2}')" && \
138+
echo "##vso[task.setvariable variable=OS_DISK_URI]$" && \
139+
echo "##vso[task.setvariable variable=MANAGED_SIG_ID]/subscriptions/c4c3550e-a965-4993-a50c-628fd38cd3e1/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/2204containerd/versions/1.1738120749.14404" && \
140+
echo "##vso[task.setvariable variable=SIG_GALLERY_NAME]PackerSigGalleryEastUS" && \
141141
echo "##vso[task.setvariable variable=PERFORMANCE_DATA_FILE]vhd-build-performance-data.json" && \
142-
echo "##vso[task.setvariable variable=PKR_RG_NAME]$(cat packer-output | grep "ResourceGroupName" | cut -d "'" -f 2 | head -1)" && \
142+
echo "##vso[task.setvariable variable=PKR_RG_NAME]aksvhdtestbuildrg" && \
143143
echo "##vso[task.setvariable variable=IS_NOT_1804]$( [[ "${OS_VERSION}" != "18.04" ]] && echo true || echo false )" && \
144144
echo "##vso[task.setvariable variable=OS_NAME]Linux" && \
145145
echo "##vso[task.setvariable variable=OS_TYPE]Linux" && \

‎vhdbuilder/packer/trivy-scan.sh

+16
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ set -euxo pipefail
44
TRIVY_REPORT_DIRNAME=/opt/azure/containers
55
TRIVY_REPORT_ROOTFS_JSON_PATH=${TRIVY_REPORT_DIRNAME}/trivy-report-rootfs.json
66
TRIVY_REPORT_IMAGE_TABLE_PATH=${TRIVY_REPORT_DIRNAME}/trivy-report-images-table.txt
7+
CVE_DIFF_QUERY_OUTPUT_PATH=${TRIVY_REPORT_DIRNAME}/cve-diff.txt
78
TRIVY_DB_REPOSITORIES="mcr.microsoft.com/mirror/ghcr/aquasecurity/trivy-db:2,ghcr.io/aquasecurity/trivy-db:2,public.ecr.aws/aquasecurity/trivy-db"
89

910
TRIVY_VERSION="0.57.0"
@@ -40,6 +41,7 @@ export SYSTEM_COLLECTIONURI=${26}
4041
export SYSTEM_TEAMPROJECT=${27}
4142
export BUILD_BUILDID=${28}
4243
export IMAGE_VERSION=${29}
44+
CVE_DIFF_UPLOAD_REPORT_NAME=${30}
4345

4446
retrycmd_if_failure() {
4547
retries=$1; wait_sleep=$2; timeout=$3; shift && shift && shift
@@ -131,6 +133,7 @@ rm "trivy_${TRIVY_VERSION}_${TRIVY_ARCH}.tar.gz"
131133
chmod a+x trivy
132134

133135
# pull vuln-to-kusto binary
136+
MODULE_VERSION="v0.0.3-03a822ef770"
134137
az storage blob download --auth-mode login --account-name ${ACCOUNT_NAME} -c vuln-to-kusto \
135138
--name ${MODULE_VERSION}/${MODULE_NAME}_linux_${GO_ARCH} \
136139
--file ./${MODULE_NAME}
@@ -187,13 +190,26 @@ for CONTAINER_IMAGE in $IMAGE_LIST; do
187190
fi
188191
done
189192

193+
./vuln-to-kusto-vhd query-report query-diff \
194+
--vhd-vhdname=${VHD_ARTIFACT_NAME} \
195+
--kusto-endpoint=${KUSTO_ENDPOINT} \
196+
--kusto-database=${KUSTO_DATABASE} \
197+
--kusto-table=${KUSTO_TABLE} \
198+
--kusto-managed-identity-client-id=${UMSI_CLIENT_ID} >> ${CVE_DIFF_QUERY_OUTPUT_PATH}
199+
190200
rm ./trivy
191201

192202
chmod a+r "${TRIVY_REPORT_ROOTFS_JSON_PATH}"
193203
chmod a+r "${TRIVY_REPORT_IMAGE_TABLE_PATH}"
194204

195205
login_with_user_assigned_managed_identity ${AZURE_MSI_RESOURCE_STRING}
196206

207+
az storage blob upload --file ${CVE_DIFF_QUERY_OUTPUT_PATH} \
208+
--container-name ${SIG_CONTAINER_NAME} \
209+
--name ${CVE_DIFF_UPLOAD_REPORT_NAME} \
210+
--account-name ${STORAGE_ACCOUNT_NAME} \
211+
--auth-mode login
212+
197213
az storage blob upload --file ${TRIVY_REPORT_ROOTFS_JSON_PATH} \
198214
--container-name ${SIG_CONTAINER_NAME} \
199215
--name ${TRIVY_UPLOAD_REPORT_NAME} \

‎vhdbuilder/packer/vhd-scanning.sh

+6-1
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ TRIVY_SCRIPT_PATH="$CDIR/$TRIVY_SCRIPT_PATH"
100100
TIMESTAMP=$(date +%s%3N)
101101
TRIVY_UPLOAD_REPORT_NAME="trivy-report-${BUILD_ID}-${TIMESTAMP}.json"
102102
TRIVY_UPLOAD_TABLE_NAME="trivy-table-${BUILD_ID}-${TIMESTAMP}.txt"
103+
CVE_DIFF_UPLOAD_REPORT_NAME="cve-diff-${BUILD_ID}-${TIMESTAMP}.txt"
103104

104105
# Extract date, revision from build number
105106
BUILD_RUN_NUMBER=$(echo $BUILD_RUN_NUMBER | cut -d_ -f 1)
@@ -143,15 +144,19 @@ az vm run-command invoke \
143144
"SYSTEM_COLLECTIONURI"=${SYSTEM_COLLECTIONURI} \
144145
"SYSTEM_TEAMPROJECT"=${SYSTEM_TEAMPROJECT} \
145146
"BUILDID"=${BUILD_ID} \
146-
"IMAGE_VERSION"=${IMAGE_VERSION}
147+
"IMAGE_VERSION"=${IMAGE_VERSION} \
148+
"CVE_DIFF_UPLOAD_REPORT_NAME"=${CVE_DIFF_UPLOAD_REPORT_NAME}
147149

148150
capture_benchmark "${SCRIPT_NAME}_run_az_scan_command"
149151

150152
az storage blob download --container-name ${SIG_CONTAINER_NAME} --name ${TRIVY_UPLOAD_REPORT_NAME} --file trivy-report.json --account-name ${STORAGE_ACCOUNT_NAME} --auth-mode login
151153
az storage blob download --container-name ${SIG_CONTAINER_NAME} --name ${TRIVY_UPLOAD_TABLE_NAME} --file trivy-images-table.txt --account-name ${STORAGE_ACCOUNT_NAME} --auth-mode login
154+
az storage blob download --container-name ${SIG_CONTAINER_NAME} --name ${CVE_DIFF_UPLOAD_REPORT_NAME} --file cve-diff.txt --account-name ${STORAGE_ACCOUNT_NAME} --auth-mode login
152155

153156
az storage blob delete --account-name ${STORAGE_ACCOUNT_NAME} --container-name ${SIG_CONTAINER_NAME} --name ${TRIVY_UPLOAD_REPORT_NAME} --auth-mode login
154157
az storage blob delete --account-name ${STORAGE_ACCOUNT_NAME} --container-name ${SIG_CONTAINER_NAME} --name ${TRIVY_UPLOAD_TABLE_NAME} --auth-mode login
158+
az storage blob delete --account-name ${STORAGE_ACCOUNT_NAME} --container-name ${SIG_CONTAINER_NAME} --name ${CVE_DIFF_UPLOAD_REPORT_NAME} --auth-mode login
159+
155160
capture_benchmark "${SCRIPT_NAME}_download_and_delete_blobs"
156161

157162
if [ ! -f "${RELEASE_NOTES_FILEPATH}" ]; then

0 commit comments

Comments
 (0)