chore: validate using ntpstat

Azure · Mar 18, 2020 · d6c724e · d6c724e
1 parent 40adb28
commit d6c724e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/parts/k8s/cloud-init/artifacts/cse_install.sh b/parts/k8s/cloud-init/artifacts/cse_install.sh
@@ -71,7 +71,7 @@ installDeps() {
         if [[ $UBUNTU_RELEASE == "18.04" ]]; then
             systemctl_stop 20 5 10 systemd-timesyncd || exit $ERR_SYSTEMCTL_STOP_FAIL
             retrycmd_if_failure 120 5 25 systemctl disable systemd-timesyncd || exit $ERR_SYSTEMCTL_STOP_FAIL
-            packages+=" ntp"
+            packages+=" ntp ntpstat"
         fi
     elif [[ $OS == $DEBIAN_OS_NAME ]]; then
         packages+=" gpg cgroup-bin"

diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go
diff --git a/test/e2e/kubernetes/scripts/time-sync-validate.sh b/test/e2e/kubernetes/scripts/time-sync-validate.sh
@@ -16,7 +16,7 @@ if [[ $OS == $UBUNTU_OS_NAME ]]; then
     sudo timedatectl status | grep 'Network time on: yes' || exit 1
     sudo timedatectl status | grep 'NTP synchronized: yes' || exit 1
   elif [[ $RELEASE == "18.04" ]]; then
-    sudo timedatectl status | grep 'systemd-timesyncd.service active: yes' || exit 1
+    sudo ntpstat | grep 'synchronised to NTP server' || exit 1
     sudo timedatectl status | grep 'System clock synchronized: yes' || exit 1
   fi
 fi

diff --git a/vhd/packer/install-dependencies.sh b/vhd/packer/install-dependencies.sh
@@ -48,6 +48,7 @@ cat << EOF >> ${VHD_LOGS_FILEPATH}
 EOF
 if [[ ${UBUNTU_RELEASE} == "18.04" ]]; then
   echo "  - ntp" >> ${VHD_LOGS_FILEPATH}
+  echo "  - ntpstat" >> ${VHD_LOGS_FILEPATH}
 fi
 
 if [[ ${UBUNTU_RELEASE} == "18.04" ]]; then