canonical-hw-cert team mailing list archive

["LIAO, YU-SIANG" <mp+439601@xxxxxxxxxxxxxxxxxx>]

LIAO, YU-SIANG has proposed merging ~flyjerry0415/hwcert-jenkins-jobs:change-command-order-to-avoid-dpkg-interrupt into hwcert-jenkins-jobs:master.

Commit message:
Modify:: change the command lines's order to avoid dpkg interrupt question.

Requested reviews:
  hwcert-jenkins (hwcert-jenkins)

For more details, see:
https://code.launchpad.net/~flyjerry0415/hwcert-jenkins-jobs/+git/hwcert-jenkins-jobs/+merge/439601
-- 
Your team hwcert-jenkins is requested to review the proposed merge of ~flyjerry0415/hwcert-jenkins-jobs:change-command-order-to-avoid-dpkg-interrupt into hwcert-jenkins-jobs:master.

diff --git a/jobs/sru/run-sru.sh b/jobs/sru/run-sru.sh
index 6d4dfef..462b863 100644
--- a/jobs/sru/run-sru.sh
+++ b/jobs/sru/run-sru.sh
@@ -47,6 +47,15 @@ cat > job.yaml <<EOF
 
         {test_cmds_convenience_functions}
         {test_cmds_dump_connection_info}
+        
+        # waiting for apt and dpkg process resource lock
+        # instead of killing process
+        cat <<EOF > wait-resource.sh
+        {wait_script}
+        EOF
+        chmod +x wait-resource.sh
+        _put wait-resource.sh /home/ubuntu
+        
         {test_cmds_pre_upgrade_actions_device}
         {test_cmds_pre_test_actions}
         {test_cmds_pre_test_actions_device}
@@ -57,14 +66,6 @@ cat > job.yaml <<EOF
         chmod +x reset-usb-hci.sh
         _put reset-usb-hci.sh /home/ubuntu
 
-        # waiting for apt and dpkg process resource lock
-        # instead of killing process
-        cat <<EOF > wait-resource.sh
-        {wait_script}
-        EOF
-        chmod +x wait-resource.sh
-        _put wait-resource.sh /home/ubuntu
-
         # don't lock the screen or suspend the system
         # so screen-related tests won't fail
         cat <<EOF > certification.gschema.override
diff --git a/jobs/sru/test-cmds-pre-test-actions.sh b/jobs/sru/test-cmds-pre-test-actions.sh
index 2906651..e231665 100644
--- a/jobs/sru/test-cmds-pre-test-actions.sh
+++ b/jobs/sru/test-cmds-pre-test-actions.sh
@@ -10,6 +10,7 @@
           wait_for_ssh
           # to provide more time for xdg etc. to be stable
           sleep 60
+          _run sudo /home/ubuntu/wait-resource.sh
           _run sudo reboot
           # the 120 sec sleep is critical otherwise you may reconnect immediate during shutting down prcess
           sleep 120
@@ -21,6 +22,8 @@
         _run sudo cp /usr/share/unattended-upgrades/20auto-upgrades-disabled  /etc/apt/apt.conf.d/20auto-upgrades
         # Disable suspend use gsettings cmd to avoid some systems won't go to suspend by gschema.override.
         _run gsettings set org.gnome.settings-daemon.plugins.power sleep-inactive-ac-type 'nothing'
+        # to avoid interrupting running apt resource.
+        _run sudo /home/ubuntu/wait-resource.sh
         _run sudo reboot
         sleep 120
         wait_for_ssh