Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Azure/AgentBaker into cam…
Browse files Browse the repository at this point in the history 
…eissner/stlsbootstrap-windows
  • Loading branch information
Cameron Meissner committed May 24, 2024
2 parents fda65d4 + 1e24319 commit ef4f24c
Show file tree
Hide file tree
Showing 132 changed files with 132 additions and 726 deletions.
2 changes: 1 addition & 1 deletion .pipelines/templates/.builder-release-template.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ steps:
SKU_NAME=${OS_VERSION} && \
if [[ "${HYPERV_GENERATION,,}" == "v2" ]]; then SKU_NAME="${SKU_NAME}gen2"; fi && \
if [[ ${OS_VERSION} == "V2" && ${ARCHITECTURE,,} == "arm64" ]]; then SKU_NAME="${SKU_NAME}arm64"; fi && \
if [[ (${OS_VERSION} == "18.04" || ${OS_VERSION} == "22.04" || ${OS_VERSION} == "24.04") && ${ARCHITECTURE,,} == "arm64" ]]; then SKU_NAME="${SKU_NAME}arm64"; fi && \
if [[ (${OS_VERSION} == "22.04" || ${OS_VERSION} == "24.04") && ${ARCHITECTURE,,} == "arm64" ]]; then SKU_NAME="${SKU_NAME}arm64"; fi && \
if [[ (${OS_VERSION} == "18.04" || ${OS_VERSION} == "20.04" || ${OS_VERSION} == "22.04") && ${ENABLE_FIPS,,} == "true" ]]; then SKU_NAME="${SKU_NAME}fips"; fi && \
if [[ ${OS_VERSION} == "V2" && ${ENABLE_FIPS,,} == "true" ]]; then SKU_NAME="${SKU_NAME}fips"; fi && \
if [[ "$(FEATURE_FLAGS)" == *"fullgpu"* ]]; then SKU_NAME="${SKU_NAME}gpu"; fi && \
Expand Down
11 changes: 1 addition & 10 deletions parts/linux/cloud-init/artifacts/ubuntu/cse_install_ubuntu.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,7 @@ installDeps() {
}

updateAptWithMicrosoftPkg() {
if [[ $(isARM64) == 1 ]]; then
if [[ "${UBUNTU_RELEASE}" == "22.04" || "${UBUNTU_RELEASE}" == "24.04" ]]; then
retrycmd_if_failure_no_stats 120 5 25 curl https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/prod.list > /tmp/microsoft-prod.list || exit $ERR_MOBY_APT_LIST_TIMEOUT
else
retrycmd_if_failure_no_stats 120 5 25 curl https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/multiarch/prod.list > /tmp/microsoft-prod.list || exit $ERR_MOBY_APT_LIST_TIMEOUT
fi
else
retrycmd_if_failure_no_stats 120 5 25 curl https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/prod.list > /tmp/microsoft-prod.list || exit $ERR_MOBY_APT_LIST_TIMEOUT
fi

retrycmd_if_failure_no_stats 120 5 25 curl https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/prod.list > /tmp/microsoft-prod.list || exit $ERR_MOBY_APT_LIST_TIMEOUT
retrycmd_if_failure 10 5 10 cp /tmp/microsoft-prod.list /etc/apt/sources.list.d/ || exit $ERR_MOBY_APT_LIST_TIMEOUT
if [[ ${UBUNTU_RELEASE} == "18.04" ]]; then {
echo "deb [arch=amd64,arm64,armhf] https://packages.microsoft.com/ubuntu/18.04/multiarch/prod testing main" > /etc/apt/sources.list.d/microsoft-prod-testing.list
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ write_files:
encoding: gzip
owner: root
content: !!binary |
H4sIAAAAAAAA/+Rae3PbtrL/X59iw+gmtltQDzu5t+no3pEl2dGNbGkoKZ1OToYDkaCEiiRYAEzi2PruZ0BSFJ+O7bQ9p3PyR8YSFvvC7m8XCz1/1lpRv7XCYtNoEGvDQJuzkFvUX4MliEl9IbHrmjYVkjNdbMBhHJar0Jeh1mhw4rFP5Iqtbo6O4bYBAIADaa6JNIOQrwl02vAKTttt8NjqBhF/TX0S/225tLHbcxgwX2LqE24/iI+VkisWiY5DEoh0N3XgwwdoHlHRN65enx1Drwcd+PjxZ5Ab4kck6t9nTKXpMG4qaS6ztiJd4kTyG8uzTeqYDqZuyInpM1NILAV0ukqf7iuwQu4CcsR8AhspA/Gm1QqwtcVrInSPWpwJ5kjdYl7LYr5D160wcl2rebs8X14vlqYxmoz689Eu3YbSbSjgzNZtsoL/hZb0gntJ7u6AfKESmiPDMK/m5syYDs3h6NwcTn+5nkz7Q3MxvhpNl4vIQOIK8p9hqUMbNTbCa2VZpw12sF0Dot8hefbu0uwPh+ZFfzxp7KPXw3z7S39C/fBLf018CRvm2rnQDgMbS5Jn258tzOVs2F+MUjOiPcF2bbpUyN6RhZFFuKQOtbAkAiwSbJDFPI/5YK05CwPkUknAoo5AoaSuAIv5vuTY2oKl/nfpCvHQl9QjQFYSr1wigMiNZMyFNZWwdkMhCXeEytJIdckCoD6VSNwISTy0IW5AuADqM0mdG6S2CqAsogs4CyXpAg0EkUCDRILvJH/89ju4dBVgDwWffw+xS+VN9MX+Q8LNY6EvwVdaxNYFdP0VBLOwBHEjHBEbJ26EClVQn5Cr3A1fviaG+0RaWCIWEH8lbPhKA+D+OuG/9ZgNa8sCD28J2FtPRCZy7DkiIYnYoQ3BNuECNY9CH3sEED9OVjxmhy4RiHyRHGfXjxspDIFWSgFNwZHW+R+9faZBEZP2J/1D78j2YxuPy0mboVpR3/4J5WkdGivgMgu7MJ2/Hxnz8fQ6+i791GserTkJYDieL4zx+V49aBFptU4QJy7BgtyBFUpADnQB2aD1tFjC+WR6frGcj8w9M62jn+mvtNxi97Da1bt6R8u7JdXkfo/UcGtrOVNjyC9wfdYDrXsWc82zzTrQZSsnFKTba96WZO2OK6RkCsszVVhevHi44BpNlf3dbvWGgr5K19PjdDUXFzWmZSxLDQO1cGCTIOXeUFXnFVAlgAjUh+btnvOHk4+7n8FmWZOepbiWFGQ4bUMHXrfb0MwwqjDtNxZyH7uWdAEhn6EArwkHFOb25Xbk8XJ8PV/0J5Mc7mcssplPVJ8Qw20/kL9Qubnaw/tsu35s15CeX2VaJ4d4d1dPURMXjyzG31uGVVlTh7kvuoWKFy3lS970/NfI4ZPxfFHydikM/zpTvNCVFHNr84cblYTQU/ulf6Mj2ud1VSfUSTohK6gXExUFHMiWUPcDIqJvdbv1UPlJbhVtzOF+khBJNkaOj64kqvn6oM63hz379dmPmHvx/xvn47d8nDg3ElEIFJBESHXT8TD1NeXjGhvz/kDJtmg10nSXBMl9Nnbbe1ioWe9+Y/3sT/dRdQD+wV5KMqouFp+YSVtyIw4K6FhYcAfrYA0I2QRzj/FSCulqudjSX84uzXejX6vvEo9KnYh96irJVUdtqy/LOfMNsY+8LuwaDcsl2F8Gl7PlkNNPhB/uxdwDZDjQvJwtzeFovoAWC2RrHYSZi/RcYt/GLvOrruX5COk1j1yxMpNOERAHlDSgCd1gOhxd969KhFZKOJheL/rj65ExTLu7ZieNkMzqrL8YvD10gM3b7hvU2Wn7PnctTMlM8on4UoDWfzfXB/ORnpiUGmLE1x6d+CLkxAh9SwPt8AGat8byerCX8gZp2k6DWMRgaRij68VBy6PDGAKQ8jJlPiTdsg0aaKppPoU7EMSGl+Lu093dy8z6D9F65zjHfDC9uhovHsj7LHvLQF9BaxZ0LLfSRSO0tt4uNtI5nw/e9S9H5tKYKI9Xr7zp7bQMxD9TqtTR7spdTwxf4/igornTwXSHMw9CQThQPwjlm3q+WsrvsaFwmGFpcPj7O9kdMmfP9PDNk1nb7LPvMmwfWF1w5i2NiQa1S/Uee7Ia6bxtNYvBWIm6oC7RQKtdy+sxHJ2bF+OJaohzcJYhqWvqkyFlaFmE2MQGyWB/3/jOwOFEhtyHdi4ZnlNHhSsnQAX4LCPD3KdlJCGWaMx+VFJhg7ltMaVeQpTJj2J2pNexUmZUQKPW0f9b77zScneRx04Y7uWtFXvf+2E4Qx+fzCEC4X3iIJ9JEAGxqEOJrRykstwmDg5duXfQm2qnoMK5ZWQnJ5drzWMVlpGAVCKUVXqytBQjExy96v//1DCvxtdTo6c1jyL5RRSGO5AcXuov4eU/fFUBNgTbgHzowh0EWEgCSNj6cSxhOJqPjdGwhnNJ58cxF8T7RPiAeQHmpKpeaBUi4q1v+3Pz0hj1FyMjU4T/T8sPXyqo4lBsq9YVXryIySrcF5M1K8yvuCnH52yFnBNfujd7BCB2FgP2+dm8LZi5Aw9La0MEePg3xnWP+ozDZyo3sKHrDeEQqPXqGNFBbGkQqAi7p1/Sa4OTVha6jK5lkX/H2lYB9iqMXVEoBEnDOzeHY2PXKrzumJXuODnWCqMY5IBWV18qpyx/r5JXKk4FdP5j+ogEGjXQ7l2vKV7fRM6/Pii+PjIo4vy8wNSN2wqXWeq+ZWFrkwcWm6y0mnHkA07zOw7uXxuGxf5o12jcGynpnbHyiheteFubckBBrrLljj8iq53cQu6CvNcGum04LT0V96rj5lFusAJA2IXmrbp3D/qDt6MoRB8WofVGth6lREUHnFr+8JJSe3pLY1J1culoQt0FH3d8hfBbXM16lfmuWD9/ftLa5actVshd01GRHI+EXrfzbUrelaVoX1zNdlo1wMQ30jrfVw5jqiHskdpkhi25307cP4iAmjGEzaxtNCfIDAqidz1tGK3sI0HLDBB+jIcPleOKygFF/JAYjXcPvf9PevtU75xpRYrqy8WZ3jlNBwX5TrTUor1ByWRCVZas1N2DO8EoKe2cB6paQSqUs7AkHOQG+3DEOJDfQ+yCZMcgMV8TCSssSIZJTqFyQ6jOtKoBrOjAapEtpYgdOhn3CmLLr1F7yuTyd6q39bpXppRpRHVaeecrvubFoKpSMPNbnqJWJ+mPe3oZhU4qsLgmUHYngBB2XfYZKXhac2wTUfHGUAWMcU06JFGaV1EqFWZZxe+qp1hFqofMr7jK34oBRInXwe0HII2IyhCaWnEA0CK7A3LmiBOEKvNtJSwOqJQp9LXIm9kUtRGVPsodV05yqam4r20pSCpzfcKM6AmHUzkXWvSNy1EGhW87EUYX5zx5soroKfDROnpH73RR/CJTHut899znqfIKvw541Et52Q2RkgrfEbd+6iavXvcSvap/Lw+5X6fmYLY0+8bgba95tCZyMFv2ubU5BngevZEB4xA9k9UU1ihWslU1ma100pl+KyLZE7RaL5Np/mTUvx4NzVKQFEyseVgoFqn/Qif74l/HuHoh3tjIxkux/iVjlxoGu3IQxbmV1MUI1nM+qOWkCi12OcF2pkiXa6fCbb2Ye9mHw/ixw4Hm+7dDczK9nEfoMOsv3pZUTfFj1l8sRsZ1T0v1NU/03C0uD5fNI4f6dopAuesoIHkTEHAA0ejHXloGpxI56m4FgnEJ6D3cgcTUVVFzXDm1yINcTZT/KShZwrZ8AsG3ewDlyXJUf7uCV6q1azSej6YXjX8GAAD//9lou5uTLAAA
H4sIAAAAAAAA/+Rae3PayLL/n0/RUbgb27sjHnZy73qLe4sAdrjBhhKQra2clGqQRjCLpNHOjJI4hu9+aiQh9HTsZPec2jr5I2WYnn5N9697enj+rLWifmuFxabRINaGgTZnIbeovwZLEJP6QmLXNW0qJGe62IDDOCxXoS9DrdHgxGMfyQ1b3Z2cwn0DAAAH0lwTaQYhXxPotOElnLfb4LHVHSL+mvok/ttyaWN/4DBgvsTUJ9x+FB8rJVcsEh2HJBDpburA+/fQPKGib9y8ujiFXg868OHDLyA3xI9I1L9PmErTYdxU0lxmbUW6xInkd5Znm9QxHUzdkBPTZ6aQWArodJU+3ZdghdwF5Ij5BDZSBuKy1QqwtcVrInSPWpwJ5kjdYl7LYr5D160wcl2reb98vbxdLE1jNBn156N9ug2l21DAma3bZAX/Cy3pBQ+S7HZAPlMJzZFhmDdzc2ZMh+Zw9NocTn+9nUz7Q3MxvhlNl4vIQOIK8p9hqUMbNTbCK2VZpw12sF0Dot8hefb22uwPh+ZVfzxpHKLXw3z7a39C/fBzf018CRvm2rnQDgMbS5Jn258tzOVs2F+MUjOiPcF2bbpUyN6JhZFFuKQOtbAkAiwSbJDFPI/5YK05CwPkUknAoo5AoaSuAIv5vuTY2oKl/nfpCvHQl9QjQFYSr1wigMiNZMyFNZWwdkMhCXeEytJIdckCoD6VSNwJSTy0IW5AuADqM0mdO6S2CqAsogs4CyXpAg0EkUCDRILvJH/8/ge4dBVgDwWf/gixS+Vd9MXhQ8LNY6EvwVdaxNYFdP0FBLOwBHEnHBEbJ+6EClVQn5Cr3A2fvySG+0RaWCIWEH8lbPhCA+D+OuG/9ZgNa8sCD28J2FtPRCZy7DkiIYnYoQ3BNuECNU9CH3sEED9NVjxmhy4RiHyWHGfXTxspDIFWSgFNwZHW+R+9faFBEZMOJ/1j78T2YxtPy0mboVpR3/4Z5WkdGivgMgu7MJ2/Gxnz8fQ2+i791GuerDkJYDieL4zx64N60CLSap0hTlyCBdmBFUpADnQB2aD1tFjC68n09dVyPjIPzLSOfqG/1HKL3eNqV+/qHS3vllSThz1Sw62t5UyNIb/A9VkPtO5FzDXPNutAl62cUJBur3lfkrU/rZCSKSzPVGH54YfHC67RVNnf7VZvKOirdD0/TVdzcVFjWsay1DBQC0c2CVIeDFV1XgFVAohAfWjeHzi/P/uw/wVsljXpWYprSUGG8zZ04FW7Dc0MowrTfmch97FrSRcQ8hkK8JpwQGFuX25HHi/Ht/NFfzLJ4X7GIpv5RPUJMdz2A/krlZubA7zPtuu0a3hCJfzeGqhqivLkoeIVyk20lK8309e/RdZOxvNFztSq2tZJapsV1LOP0hwHsiVUx0dE9K1utx4rN0mFom25TE4iOfFvdHRRk6nK6XvMrU0Pe/ari58w9+L/N86Hr/k2cWokouWFrqSKUeRSkERI1bt6mPqa8m2NjXl/oGRbtBppuk8Q9yEbu+3Ixt2ubr37lfWLv9xH1YH3J3spSbM/OYO25E4cFdCxsGAH62ANCNkEc4/xUuroarnYpF3Prs23o9+qu8MnpU7EPnWV5KpHstWX5Zz5itgnNoD7RsNyCfaXwfVsOeT0I+HHmw73ABkONK9nS3M4mi+gxQLZWgdh5mo0l9i3scv8qotWPkJ6zRNXrMyk9gPigJKWIqEbTIej2/5NidBKCQfT20V/fDsyhmm9bnbSCMmszvqLwZtjTW/edy9RZ68dOpe1MCUzyUfiSwFa/+1cH8xHemJSaogRN7I68UXIiRH6lgba8QM0743l7eAg5RJp2l6DWMRgaRij28VRy5PjxRKQ8jJlPiT9jw0aaKoNOocdCGLDC7H7uNu9yKz/GK13TnPMB9Obm/Hikbwvsn0j+gJas6BjuTkqGqG19XaxNcr5fPC2fz0yl8ZEebx65bK31zIQ/0ypUke7L7crMXyN44OKJglH0x3OPAgF4UD9IJSX9Xy1lN9TQ+E4ldDg+Pd3sjtmzoHp8ZtvZm2zT77LsH1kdcWZtzQmGtQu1Xvsm9VIJyirWQzGStQVdYkGWu1aXg91Db4aT9TdJgdnGZK6Ni0ZO4WWRYhNbJAMDh3kdwYOJzLkPrRzyfCcOipcOQEqwGcZGeYhLSMJsURj9pOSChvMbYsp9RKiTH4UsyNtsEuZUQGNWkf/b73zUsvdDp56Z3yQt1ZsiB+G4Qx9fDLHCIR3iYN8JkEExKIOJbZykMpymzg4dOXBQZfVTkGFc8vITk4ud5+JVVhGAlKJUFbpm6WlGJng6E3//6eGeTO+nRo9rXkSyS+iMOxAcnihv4AX//BVBdgQbAPyoQs7CLCQBJCw9dNYwnA0HxujYQ3nks5PYy6I95HwAfMCzElVvdAqRMRb3/Tn5rUx6i9GRqYI/5+Wv05XUMWh2Fatq7r5RmQV7ovJmhXmV1xx43O2Qs6JL927AwIQO4sBh/xs3hfM3IOHpbUhAjz8O+O6R33G4ROVG9jQ9YZwCNR6dYzoILY0CFSEPdAv6bXBSSsLXUbXssi/Y22rAHsVxq4oFIKk4Z2bw7GxbxXm9WalO85OtcJwBDmg1dWXyvHI36vklYpTAZ3/nD4igUYNtAfXa4rXV5HzXx8UX54YFHF+XmHqxm2Fyyx137KwtckDi01WWs2A6RGn+R0H9+8Nw2J/tG80HoyU9M5YecWLVrytTTmgIFfZcscfkdXO4iB3QT5oA902nJce/3rVcfMkN1gBIOxC817duwf9wZtRFKKPi9B6I1tPUqKiA04tf3xJqT29pTGpOrl0NKHugk87vkL4LW5mvcp8V6yfPz9r7fPTFivkrumoSI5HQq/a+TYl78pStC9uZnutGmDiG2md7yuHMdUQ9kRtMsOW3Gv4w4MIqBlD2MzaRnOCzKAgeqnRhtHKIRK0zADhp3j4UDmuqBxQxE9D0Xj32Pv/rLfP9c6FVqSovlxc6J3zdFCQ70RLLdolSiYTqrJkpe4f3QlGSWnnPFDVClKhnIUl4SA32IcTxoH8EWIXJDsFifmaSFhhQTJMcgqVG0J1plUNYEUHVotsKUXs0Mm4VxBbfh86UCaXv3O9rdc9D6VMI6rzyjtf8X0mBlWVgplfZxS1Okt/rtHLKHRWgcU1gbI/A4Sw67JPSMHTmmObiIo3hipgjGvSMYnSvIpSqTDLKn5XPcUqUj1mfsVV/lYMIEq8jm4/AmlEVIbQ1IojgBbZHZEzR5wgVJlvK2FxRKVMoa9F3symqI2o9FHuuHKSS03FQ21LQVKZ6zfMiL7hcCrnQou+cT3KoPB9J8Lo4pwnT1YRPQU+Wkfv6J0uil9kymOd7577fKu8wnvvI38xdXgQK7ohUlLhO+LWz93k1etBopc1SBYfTp2ag9nS7BuDN73myZrIwWzZ59bmFOB59EYGjEP0TFZTWKNYyVbVZLbSSWf6rYjkQNBqvUim+ZNR/3Y0NEtBUjCx5mGhWKT+C50din8d4+qFeGMjGy/F+peMXWoY7MtBFOdWUhcjWM/5oJaTKrTY5QTbmSJdrp0Kt/Vi7mUfDuPHDgea794Mzcn0eh6hw6y/eFNSNcWPWX+xGBm3PS3V1zzTc7e4PFw2Txzq2ykC5a6jgORdQMABRKOf72gZnErkqLsVCMYloHewA4mpq6LmtHJqkQe5mij/S1CyhG35BIKv9wDKk+Wo/noFr1Rr32g8H02vGv8MAAD//yQC16JlKgAA


- path: /opt/azure/containers/provision_configs.sh
Expand Down
11 changes: 1 addition & 10 deletions pkg/agent/testdata/AKSUbuntu1604+Containerd/line62.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,7 @@ installDeps() {
}

updateAptWithMicrosoftPkg() {
if [[ $(isARM64) == 1 ]]; then
if [[ "${UBUNTU_RELEASE}" == "22.04" || "${UBUNTU_RELEASE}" == "24.04" ]]; then
retrycmd_if_failure_no_stats 120 5 25 curl https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/prod.list > /tmp/microsoft-prod.list || exit $ERR_MOBY_APT_LIST_TIMEOUT
else
retrycmd_if_failure_no_stats 120 5 25 curl https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/multiarch/prod.list > /tmp/microsoft-prod.list || exit $ERR_MOBY_APT_LIST_TIMEOUT
fi
else
retrycmd_if_failure_no_stats 120 5 25 curl https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/prod.list > /tmp/microsoft-prod.list || exit $ERR_MOBY_APT_LIST_TIMEOUT
fi

retrycmd_if_failure_no_stats 120 5 25 curl https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/prod.list > /tmp/microsoft-prod.list || exit $ERR_MOBY_APT_LIST_TIMEOUT
retrycmd_if_failure 10 5 10 cp /tmp/microsoft-prod.list /etc/apt/sources.list.d/ || exit $ERR_MOBY_APT_LIST_TIMEOUT
if [[ ${UBUNTU_RELEASE} == "18.04" ]]; then {
echo "deb [arch=amd64,arm64,armhf] https://packages.microsoft.com/ubuntu/18.04/multiarch/prod testing main" > /etc/apt/sources.list.d/microsoft-prod-testing.list
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ write_files:
encoding: gzip
owner: root
content: !!binary |
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


- path: /opt/azure/containers/provision_configs.sh
Expand Down
11 changes: 1 addition & 10 deletions pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line62.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,7 @@ installDeps() {
}

updateAptWithMicrosoftPkg() {
if [[ $(isARM64) == 1 ]]; then
if [[ "${UBUNTU_RELEASE}" == "22.04" || "${UBUNTU_RELEASE}" == "24.04" ]]; then
retrycmd_if_failure_no_stats 120 5 25 curl https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/prod.list > /tmp/microsoft-prod.list || exit $ERR_MOBY_APT_LIST_TIMEOUT
else
retrycmd_if_failure_no_stats 120 5 25 curl https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/multiarch/prod.list > /tmp/microsoft-prod.list || exit $ERR_MOBY_APT_LIST_TIMEOUT
fi
else
retrycmd_if_failure_no_stats 120 5 25 curl https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/prod.list > /tmp/microsoft-prod.list || exit $ERR_MOBY_APT_LIST_TIMEOUT
fi

retrycmd_if_failure_no_stats 120 5 25 curl https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/prod.list > /tmp/microsoft-prod.list || exit $ERR_MOBY_APT_LIST_TIMEOUT
retrycmd_if_failure 10 5 10 cp /tmp/microsoft-prod.list /etc/apt/sources.list.d/ || exit $ERR_MOBY_APT_LIST_TIMEOUT
if [[ ${UBUNTU_RELEASE} == "18.04" ]]; then {
echo "deb [arch=amd64,arm64,armhf] https://packages.microsoft.com/ubuntu/18.04/multiarch/prod testing main" > /etc/apt/sources.list.d/microsoft-prod-testing.list
Expand Down
Loading

0 comments on commit ef4f24c

Please sign in to comment.