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/e2e-timeouts
  • Loading branch information
Cameron Meissner committed Jan 3, 2024
2 parents 0585752 + df08269 commit e2045fd
Show file tree
Hide file tree
Showing 124 changed files with 501 additions and 132 deletions.
9 changes: 8 additions & 1 deletion parts/linux/cloud-init/artifacts/ubuntu/cse_install_ubuntu.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,14 @@ installDeps() {
aptmarkWALinuxAgent hold
apt_get_update || exit $ERR_APT_UPDATE_TIMEOUT

pkg_list=(apt-transport-https ca-certificates ceph-common cgroup-lite cifs-utils conntrack cracklib-runtime ebtables ethtool git glusterfs-client htop iftop init-system-helpers inotify-tools iotop iproute2 ipset iptables nftables jq libpam-pwquality libpwquality-tools mount nfs-common pigz socat sysfsutils sysstat traceroute util-linux xz-utils netcat dnsutils zip rng-tools kmod gcc make dkms initramfs-tools linux-headers-$(uname -r) linux-modules-extra-$(uname -r))
pkg_list=(ca-certificates ceph-common cgroup-lite cifs-utils conntrack cracklib-runtime ebtables ethtool git glusterfs-client htop iftop init-system-helpers inotify-tools iotop iproute2 ipset iptables nftables jq libpam-pwquality libpwquality-tools mount nfs-common pigz socat sysfsutils sysstat traceroute util-linux xz-utils netcat-openbsd zip rng-tools kmod gcc make dkms initramfs-tools linux-headers-$(uname -r) linux-modules-extra-$(uname -r))

if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
# bind9-dnsutils is not available in the 1804 pkg set
pkg_list+=(dnsutils)
else
pkg_list+=(bind9-dnsutils)
fi

local OSVERSION
OSVERSION=$(grep DISTRIB_RELEASE /etc/*-release| cut -f 2 -d "=")
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 |
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


- path: /opt/azure/containers/provision_configs.sh
Expand Down
8 changes: 7 additions & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Containerd/line62.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@ installDeps() {
aptmarkWALinuxAgent hold
apt_get_update || exit $ERR_APT_UPDATE_TIMEOUT

pkg_list=(apt-transport-https ca-certificates ceph-common cgroup-lite cifs-utils conntrack cracklib-runtime ebtables ethtool git glusterfs-client htop iftop init-system-helpers inotify-tools iotop iproute2 ipset iptables nftables jq libpam-pwquality libpwquality-tools mount nfs-common pigz socat sysfsutils sysstat traceroute util-linux xz-utils netcat dnsutils zip rng-tools kmod gcc make dkms initramfs-tools linux-headers-$(uname -r) linux-modules-extra-$(uname -r))
pkg_list=(ca-certificates ceph-common cgroup-lite cifs-utils conntrack cracklib-runtime ebtables ethtool git glusterfs-client htop iftop init-system-helpers inotify-tools iotop iproute2 ipset iptables nftables jq libpam-pwquality libpwquality-tools mount nfs-common pigz socat sysfsutils sysstat traceroute util-linux xz-utils netcat-openbsd zip rng-tools kmod gcc make dkms initramfs-tools linux-headers-$(uname -r) linux-modules-extra-$(uname -r))

if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
pkg_list+=(dnsutils)
else
pkg_list+=(bind9-dnsutils)
fi

local OSVERSION
OSVERSION=$(grep DISTRIB_RELEASE /etc/*-release| cut -f 2 -d "=")
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
8 changes: 7 additions & 1 deletion pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line62.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@ installDeps() {
aptmarkWALinuxAgent hold
apt_get_update || exit $ERR_APT_UPDATE_TIMEOUT

pkg_list=(apt-transport-https ca-certificates ceph-common cgroup-lite cifs-utils conntrack cracklib-runtime ebtables ethtool git glusterfs-client htop iftop init-system-helpers inotify-tools iotop iproute2 ipset iptables nftables jq libpam-pwquality libpwquality-tools mount nfs-common pigz socat sysfsutils sysstat traceroute util-linux xz-utils netcat dnsutils zip rng-tools kmod gcc make dkms initramfs-tools linux-headers-$(uname -r) linux-modules-extra-$(uname -r))
pkg_list=(ca-certificates ceph-common cgroup-lite cifs-utils conntrack cracklib-runtime ebtables ethtool git glusterfs-client htop iftop init-system-helpers inotify-tools iotop iproute2 ipset iptables nftables jq libpam-pwquality libpwquality-tools mount nfs-common pigz socat sysfsutils sysstat traceroute util-linux xz-utils netcat-openbsd zip rng-tools kmod gcc make dkms initramfs-tools linux-headers-$(uname -r) linux-modules-extra-$(uname -r))

if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
pkg_list+=(dnsutils)
else
pkg_list+=(bind9-dnsutils)
fi

local OSVERSION
OSVERSION=$(grep DISTRIB_RELEASE /etc/*-release| cut -f 2 -d "=")
Expand Down
Loading

0 comments on commit e2045fd

Please sign in to comment.