Skip to content

Commit

Permalink
Updated the build image link for commit diff (#1003)
Browse files Browse the repository at this point in the history 
As discussed, we have updated the build image with commit diff details for all the builds generated.
  • Loading branch information
@kannankvs
kannankvs authored May 18, 2022
1 parent f7c78fd commit 6437752
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 8 deletions.
40 changes: 40 additions & 0 deletions generate_sonic_image_links.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ git pull origin sonic_latest_images_links

#set -euo pipefail


DEFID_BRCM_CMT="$(curl -s 'https://sonic-build.azurewebsites.net/ui/sonic/pipelines/138/builds?branchName=master' | jq -r '.value[0].id')"

DEFID_BRCM="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/definitions?name=Azure.sonic-buildimage.official.broadcom' | jq -r '.value[0].id')"
DEFID_MLNX="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/definitions?name=Azure.sonic-buildimage.official.mellanox' | jq -r '.value[0].id')"
DEFID_VS="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/definitions?name=Azure.sonic-buildimage.official.vs' | jq -r '.value[0].id')"
Expand Down Expand Up @@ -67,82 +70,118 @@ do
ARTF_MRV="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/builds/'"${BUILD_MRV}"'/artifacts?artifactName=sonic-buildimage.marvell-armhf&api-version=5.1' | jq -r '.resource.downloadUrl')"
ARTF_NPH="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/builds/'"${BUILD_NPH}"'/artifacts?artifactName=sonic-buildimage.nephos&api-version=5.1' | jq -r '.resource.downloadUrl')"

COMMIT_BRCM_1="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/builds?definitions='"${DEFID_BRCM}"'&branchName=refs/heads/'"${BRANCH}"'&$top=2&resultFilter=succeeded&api-version=6.0' | jq -r '.value[0].sourceVersion')"
COMMIT_BRCM_2="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/builds?definitions='"${DEFID_BRCM}"'&branchName=refs/heads/'"${BRANCH}"'&$top=2&resultFilter=succeeded&api-version=6.0' | jq -r '.value[1].sourceVersion')"
COMMIT_MLNX_1="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/builds?definitions='"${DEFID_MLNX}"'&branchName=refs/heads/'"${BRANCH}"'&$top=2&resultFilter=succeeded&api-version=6.0' | jq -r '.value[0].sourceVersion')"
COMMIT_MLNX_2="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/builds?definitions='"${DEFID_MLNX}"'&branchName=refs/heads/'"${BRANCH}"'&$top=2&resultFilter=succeeded&api-version=6.0' | jq -r '.value[1].sourceVersion')"
COMMIT_VS_1="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/builds?definitions='"${DEFID_VS}"'&branchName=refs/heads/'"${BRANCH}"'&$top=2&resultFilter=succeeded&api-version=6.0' | jq -r '.value[0].sourceVersion')"
COMMIT_VS_2="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/builds?definitions='"${DEFID_VS}"'&branchName=refs/heads/'"${BRANCH}"'&$top=2&resultFilter=succeeded&api-version=6.0' | jq -r '.value[1].sourceVersion')"
COMMIT_INNO_1="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/builds?definitions='"${DEFID_INNO}"'&branchName=refs/heads/'"${BRANCH}"'&$top=2&resultFilter=succeeded&api-version=6.0' | jq -r '.value[0].sourceVersion')"
COMMIT_INNO_2="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/builds?definitions='"${DEFID_INNO}"'&branchName=refs/heads/'"${BRANCH}"'&$top=2&resultFilter=succeeded&api-version=6.0' | jq -r '.value[1].sourceVersion')"
COMMIT_BFT_1="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/builds?definitions='"${DEFID_BFT}"'&branchName=refs/heads/'"${BRANCH}"'&$top=2&resultFilter=succeeded&api-version=6.0' | jq -r '.value[0].sourceVersion')"
COMMIT_BFT_2="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/builds?definitions='"${DEFID_BFT}"'&branchName=refs/heads/'"${BRANCH}"'&$top=2&resultFilter=succeeded&api-version=6.0' | jq -r '.value[1].sourceVersion')"
COMMIT_CHE_1="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/builds?definitions='"${DEFID_CHE}"'&branchName=refs/heads/'"${BRANCH}"'&$top=2&resultFilter=succeeded&api-version=6.0' | jq -r '.value[0].sourceVersion')"
COMMIT_CHE_2="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/builds?definitions='"${DEFID_CHE}"'&branchName=refs/heads/'"${BRANCH}"'&$top=2&resultFilter=succeeded&api-version=6.0' | jq -r '.value[1].sourceVersion')"
COMMIT_CTC_1="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/builds?definitions='"${DEFID_CTC}"'&branchName=refs/heads/'"${BRANCH}"'&$top=2&resultFilter=succeeded&api-version=6.0' | jq -r '.value[0].sourceVersion')"
COMMIT_CTC_2="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/builds?definitions='"${DEFID_CTC}"'&branchName=refs/heads/'"${BRANCH}"'&$top=2&resultFilter=succeeded&api-version=6.0' | jq -r '.value[1].sourceVersion')"
COMMIT_CTC64_1="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/builds?definitions='"${DEFID_CTC64}"'&branchName=refs/heads/'"${BRANCH}"'&$top=2&resultFilter=succeeded&api-version=6.0' | jq -r '.value[0].sourceVersion')"
COMMIT_CTC64_2="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/builds?definitions='"${DEFID_CTC64}"'&branchName=refs/heads/'"${BRANCH}"'&$top=2&resultFilter=succeeded&api-version=6.0' | jq -r '.value[1].sourceVersion')"
COMMIT_GRC_1="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/builds?definitions='"${DEFID_GRC}"'&branchName=refs/heads/'"${BRANCH}"'&$top=2&resultFilter=succeeded&api-version=6.0' | jq -r '.value[0].sourceVersion')"
COMMIT_GRC_2="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/builds?definitions='"${DEFID_GRC}"'&branchName=refs/heads/'"${BRANCH}"'&$top=2&resultFilter=succeeded&api-version=6.0' | jq -r '.value[1].sourceVersion')"
COMMIT_MRV_1="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/builds?definitions='"${DEFID_MRV}"'&branchName=refs/heads/'"${BRANCH}"'&$top=2&resultFilter=succeeded&api-version=6.0' | jq -r '.value[0].sourceVersion')"
COMMIT_MRV_2="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/builds?definitions='"${DEFID_MRV}"'&branchName=refs/heads/'"${BRANCH}"'&$top=2&resultFilter=succeeded&api-version=6.0' | jq -r '.value[1].sourceVersion')"
COMMIT_NPH_1="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/builds?definitions='"${DEFID_NPH}"'&branchName=refs/heads/'"${BRANCH}"'&$top=2&resultFilter=succeeded&api-version=6.0' | jq -r '.value[0].sourceVersion')"
COMMIT_NPH_2="$(curl -s 'https://dev.azure.com/mssonic/build/_apis/build/builds?definitions='"${DEFID_NPH}"'&branchName=refs/heads/'"${BRANCH}"'&$top=2&resultFilter=succeeded&api-version=6.0' | jq -r '.value[1].sourceVersion')"

echo "\"${BRANCH}\": {" >> sonic_image_links.json
echo "\"sonic-broadcom.bin\": {" >> sonic_image_links.json
echo " \"url\": \"$(echo "${ARTF_BRCM}" | sed 's/format=zip/format=file\&subpath=\/target\/sonic-broadcom.bin/')\"," >> sonic_image_links.json
echo " \"build-url\": \"https://dev.azure.com/mssonic/build/_build/results?buildId=${BUILD_BRCM}&view=results\"," >> sonic_image_links.json
echo " \"diff\": \"https://github.com/Azure/sonic-buildimage/compare/"${COMMIT_BRCM_2}"..."${COMMIT_BRCM_1}"\"," >> sonic_image_links.json
echo " \"build\": \"${BUILD_BRCM}\"," >> sonic_image_links.json
echo " \"date\": \"${BUILD_BRCM_TS}\"" >> sonic_image_links.json
echo " }," >> sonic_image_links.json
echo "\"sonic-aboot-broadcom.swi\": {" >> sonic_image_links.json
echo " \"url\": \"$(echo "${ARTF_BRCM}" | sed 's/format=zip/format=file\&subpath=\/target\/sonic-aboot-broadcom.swi/')\"," >> sonic_image_links.json
echo " \"build-url\": \"https://dev.azure.com/mssonic/build/_build/results?buildId=${BUILD_BRCM}&view=results\"," >> sonic_image_links.json
echo " \"diff\": \"https://github.com/Azure/sonic-buildimage/compare/"${COMMIT_BRCM_2}"..."${COMMIT_BRCM_1}"\"," >> sonic_image_links.json
echo " \"build\": \"${BUILD_BRCM}\"," >> sonic_image_links.json
echo " \"date\": \"${BUILD_BRCM_TS}\"" >> sonic_image_links.json
echo " }," >> sonic_image_links.json
echo "\"sonic-mellanox.bin\": {" >> sonic_image_links.json
echo " \"url\": \"$(echo "${ARTF_MLNX}" | sed 's/format=zip/format=file\&subpath=\/target\/sonic-mellanox.bin/')\"," >> sonic_image_links.json
echo " \"build-url\": \"https://dev.azure.com/mssonic/build/_build/results?buildId=${BUILD_MLNX}&view=results\"," >> sonic_image_links.json
echo " \"diff\": \"https://github.com/Azure/sonic-buildimage/compare/"${COMMIT_MLNX_2}"..."${COMMIT_MLNX_1}"\"," >> sonic_image_links.json
echo " \"build\": \"${BUILD_MLNX}\"," >> sonic_image_links.json
echo " \"date\": \"${BUILD_MLNX_TS}\"" >> sonic_image_links.json
echo " }," >> sonic_image_links.json
echo "\"sonic-vs.img.gz\": {" >> sonic_image_links.json
echo " \"url\": \"$(echo "${ARTF_VS}" | sed 's/format=zip/format=file\&subpath=\/target\/sonic-vs.img.gz/')\"," >> sonic_image_links.json
echo " \"build-url\": \"https://dev.azure.com/mssonic/build/_build/results?buildId=${BUILD_VS}&view=results\"," >> sonic_image_links.json
echo " \"diff\": \"https://github.com/Azure/sonic-buildimage/compare/"${COMMIT_VS_2}"..."${COMMIT_VS_1}"\"," >> sonic_image_links.json
echo " \"build\": \"${BUILD_VS}\"," >> sonic_image_links.json
echo " \"date\": \"${BUILD_VS_TS}\"" >> sonic_image_links.json
echo " }," >> sonic_image_links.json
echo "\"sonic-innovium.bin\": {" >> sonic_image_links.json
echo " \"url\": \"$(echo "${ARTF_INNO}" | sed 's/format=zip/format=file\&subpath=\/target\/sonic-innovium.bin/')\"," >> sonic_image_links.json
echo " \"build-url\": \"https://dev.azure.com/mssonic/build/_build/results?buildId=${BUILD_INNO}&view=results\"," >> sonic_image_links.json
echo " \"diff\": \"https://github.com/Azure/sonic-buildimage/compare/"${COMMIT_INNO_2}"..."${COMMIT_INNO_1}"\"," >> sonic_image_links.json
echo " \"build\": \"${BUILD_INNO}\"," >> sonic_image_links.json
echo " \"date\": \"${BUILD_INNO_TS}\"" >> sonic_image_links.json
echo " }," >> sonic_image_links.json
echo "\"sonic-innovium-dbg.bin\": {" >> sonic_image_links.json
echo " \"url\": \"$(echo "${ARTF_INNO}" | sed 's/format=zip/format=file\&subpath=\/target\/sonic-innovium-dbg.bin/')\"," >> sonic_image_links.json
echo " \"build-url\": \"https://dev.azure.com/mssonic/build/_build/results?buildId=${BUILD_INNO}&view=results\"," >> sonic_image_links.json
echo " \"diff\": \"https://github.com/Azure/sonic-buildimage/compare/"${COMMIT_INNO_2}"..."${COMMIT_INNO_1}"\"," >> sonic_image_links.json
echo " \"build\": \"${BUILD_INNO}\"," >> sonic_image_links.json
echo " \"date\": \"${BUILD_INNO_TS}\"" >> sonic_image_links.json
echo " }," >> sonic_image_links.json
echo "\"sonic-barefoot.bin\": {" >> sonic_image_links.json
echo " \"url\": \"$(echo "${ARTF_BFT}" | sed 's/format=zip/format=file\&subpath=\/target\/sonic-barefoot.bin/')\"," >> sonic_image_links.json
echo " \"build-url\": \"https://dev.azure.com/mssonic/build/_build/results?buildId=${BUILD_BFT}&view=results\"," >> sonic_image_links.json
echo " \"diff\": \"https://github.com/Azure/sonic-buildimage/compare/"${COMMIT_BFT_2}"..."${COMMIT_BFT_1}"\"," >> sonic_image_links.json
echo " \"build\": \"${BUILD_BFT}\"," >> sonic_image_links.json
echo " \"date\": \"${BUILD_BFT_TS}\"" >> sonic_image_links.json
echo " }," >> sonic_image_links.json
echo "\"sonic-centec.bin\": {" >> sonic_image_links.json
echo " \"url\": \"$(echo "${ARTF_CTC}" | sed 's/format=zip/format=file\&subpath=\/target\/sonic-centec.bin/')\"," >> sonic_image_links.json
echo " \"build-url\": \"https://dev.azure.com/mssonic/build/_build/results?buildId=${BUILD_CTC}&view=results\"," >> sonic_image_links.json
echo " \"diff\": \"https://github.com/Azure/sonic-buildimage/compare/"${COMMIT_CTC_2}"..."${COMMIT_CTC_1}"\"," >> sonic_image_links.json
echo " \"build\": \"${BUILD_CTC}\"," >> sonic_image_links.json
echo " \"date\": \"${BUILD_CTC_TS}\"" >> sonic_image_links.json
echo " }," >> sonic_image_links.json
echo "\"sonic-centec-arm64.bin\": {" >> sonic_image_links.json
echo " \"url\": \"$(echo "${ARTF_CTC64}" | sed 's/format=zip/format=file\&subpath=\/target\/sonic-centec-arm64.bin/')\"," >> sonic_image_links.json
echo " \"build-url\": \"https://dev.azure.com/mssonic/build/_build/results?buildId=${BUILD_CTC64}&view=results\"," >> sonic_image_links.json
echo " \"diff\": \"https://github.com/Azure/sonic-buildimage/compare/"${COMMIT_CTC64_2}"..."${COMMIT_CTC64_1}"\"," >> sonic_image_links.json
echo " \"build\": \"${BUILD_CTC64}\"," >> sonic_image_links.json
echo " \"date\": \"${BUILD_CTC64_TS}\"" >> sonic_image_links.json
echo " }," >> sonic_image_links.json
echo "\"sonic-generic.bin\": {" >> sonic_image_links.json
echo " \"url\": \"$(echo "${ARTF_GRC}" | sed 's/format=zip/format=file\&subpath=\/target\/sonic-generic.bin/')\"," >> sonic_image_links.json
echo " \"build-url\": \"https://dev.azure.com/mssonic/build/_build/results?buildId=${BUILD_GRC}&view=results\"," >> sonic_image_links.json
echo " \"diff\": \"https://github.com/Azure/sonic-buildimage/compare/"${COMMIT_GRC_2}"..."${COMMIT_GRC_1}"\"," >> sonic_image_links.json
echo " \"build\": \"${BUILD_GRC}\"," >> sonic_image_links.json
echo " \"date\": \"${BUILD_GRC_TS}\"" >> sonic_image_links.json
echo " }," >> sonic_image_links.json
echo "\"sonic-generic-dbg.bin\": {" >> sonic_image_links.json
echo " \"url\": \"$(echo "${ARTF_GRC}" | sed 's/format=zip/format=file\&subpath=\/target\/sonic-generic-dbg.bin/')\"," >> sonic_image_links.json
echo " \"build-url\": \"https://dev.azure.com/mssonic/build/_build/results?buildId=${BUILD_GRC}&view=results\"," >> sonic_image_links.json
echo " \"diff\": \"https://github.com/Azure/sonic-buildimage/compare/"${COMMIT_GRC_2}"..."${COMMIT_GRC_1}"\"," >> sonic_image_links.json
echo " \"build\": \"${BUILD_GRC}\"," >> sonic_image_links.json
echo " \"date\": \"${BUILD_GRC_TS}\"" >> sonic_image_links.json
echo " }," >> sonic_image_links.json
echo "\"sonic-marvell-armhf.bin\": {" >> sonic_image_links.json
echo " \"url\": \"$(echo "${ARTF_MRV}" | sed 's/format=zip/format=file\&subpath=\/target\/sonic-marvell-armhf.bin/')\"," >> sonic_image_links.json
echo " \"build-url\": \"https://dev.azure.com/mssonic/build/_build/results?buildId=${BUILD_MRV}&view=results\"," >> sonic_image_links.json
echo " \"diff\": \"https://github.com/Azure/sonic-buildimage/compare/"${COMMIT_MRV_2}"..."${COMMIT_MRV_1}"\"," >> sonic_image_links.json
echo " \"build\": \"${BUILD_MRV}\"," >> sonic_image_links.json
echo " \"date\": \"${BUILD_MRV_TS}\"" >> sonic_image_links.json
echo " }," >> sonic_image_links.json
echo "\"sonic-nephos.bin\": {" >> sonic_image_links.json
echo " \"url\": \"$(echo "${ARTF_NPH}" | sed 's/format=zip/format=file\&subpath=\/target\/sonic-nephos.bin/')\"," >> sonic_image_links.json
echo " \"build-url\": \"https://dev.azure.com/mssonic/build/_build/results?buildId=${BUILD_NPH}&view=results\"," >> sonic_image_links.json
echo " \"diff\": \"https://github.com/Azure/sonic-buildimage/compare/"${COMMIT_NPH_2}"..."${COMMIT_NPH_1}"\"," >> sonic_image_links.json
echo " \"build\": \"${BUILD_NPH}\"," >> sonic_image_links.json
echo " \"date\": \"${BUILD_NPH_TS}\"" >> sonic_image_links.json
echo " }" >> sonic_image_links.json
Expand All @@ -153,3 +192,4 @@ echo "\n}" >> sonic_image_links.json
git add sonic_image_links.json
git commit -m "latest links for sonic images in dedicated branch sonic_latest_images_links"
git push -f --set-upstream origin sonic_latest_images_links

20 changes: 12 additions & 8 deletions sonic_latest_images.html
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

<html lang="en">

<head>
Expand Down Expand Up @@ -33,7 +34,7 @@

<body>
<div class="text-center">
<img class="d-block mx-auto mb-4" src="https://azure.github.io/SONiC/pdf/newsletters/newsletter_images/sonic-logo_40percentage.png" alt="SONiC logo">
<img class="d-block mx-auto mb-4" src="https://sonic-net.github.io/SONiC/pdf/newsletters/newsletter_images/sonic-logo_40percentage.png" alt="SONiC logo">
</div>
<div class="list-group" id="builds">
<table style="width:1200px" border="2" align="center" id="disp_table" >
Expand Down Expand Up @@ -67,7 +68,6 @@ <h2> Latest Successful Builds </h2>

</p>
<p class="mt-4">
<b> NOTE: </b> The 5 digit number given in the cells specifies the build Id of the images.
</p>
<p class="mt-4">
<a href="https://sonic-build.azurewebsites.net/ui/sonic/Pipelines">click here</a></span></td> for previous builds <br>
Expand All @@ -80,7 +80,7 @@ <h2> Latest Successful Builds </h2>

<script>
$(document).ready(function () {
$.getJSON("https://raw.githubusercontent.com/Azure/SONiC/sonic_latest_images_links/sonic_image_links.json",
$.getJSON("https://raw.githubusercontent.com/sonic-net/SONiC/sonic_latest_images_links/sonic_image_links.json",
function(data) {
dbs = data;
branches = Object.keys(data);
Expand All @@ -92,9 +92,10 @@ <h2> Latest Successful Builds </h2>
for (let j = 0; j < images.length; j++) {
image_name = images[j];
image = data[branches[i]][images[j]];
commit_dif = data[branches[i]][images[j]];
image_platform = image_name.split(".")[0];
image_platform2 = image_name;
if(image_platform.length == 1){
if(image_platform.length == 1){
platform = ""
}else{
platform = image_platform.split("sonic-")[1];
Expand All @@ -106,19 +107,22 @@ <h2> Latest Successful Builds </h2>
image_avail = true;
image_url = image['url'];
build_id = image['build'];
if(image_url === 'null' || image_url === ""){
commit = commit_dif['diff'];
if(image_url === 'null' || image_url === ""){
image_avail = false;
}
if ( !$("#"+platform).length ){
platform_column = "<tr id=\""+ platform +"\"><td style=\" text-align: center; \"><strong>"+ platform.toUpperCase()+"</strong></td></tr>";
$("#disp_table").append(platform_column);
}
if (image_avail)
image_column ="<td style=\"text-align: center;\"><span style=\"color: #0000ff;\"><a href=\""+ image_url +"\">"+platform2+"-"+build_id+"</a></span></td>";
image_column ="<td style=\"text-align: center;\"><span style=\"color: #0000ff;\"><a href=\""+ image_url +"\">"+platform2+"-"+build_id+"</a> : <a href=\""+ commit +"\">commit_diff</a></span></td>";

else
image_column ="<td style=\"text-align: center;\"><span style=\"color: #0000ff;\">N/A</span></td>";

$("#"+platform).append(image_column);

}
}

Expand All @@ -127,4 +131,4 @@ <h2> Latest Successful Builds </h2>
</script>

</body>
</html>
</html>

0 comments on commit 6437752

Please sign in to comment.