Bug 2171: Wait for cloud init

Removes the explicit add of the GPG key from stage 3 as we
no longer use that key

Adds an explicit wait for cloud-init to finish before
proceeding with installation

Fixes bug 2171

Change-Id: I268efa1b0b322444d20ac9641745303b330bfd6a
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index 9b03016..a65b8b7 100644 (file)
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -448,8 +448,8 @@ node("${params.NODE}") {
                         pty: true
                     ]
 
-                    // Force loading of the ETSI Debian Package Signing Key
-                    sshCommand remote: remote, command: 'sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93EC7342B1168CDB'
+                    // Ensure the VM is ready
+                    sshCommand remote: remote, command: 'cloud-init status --wait'
                     // Force time sync to avoid clock drift and invalid certificates
                     sshCommand remote: remote, command: 'sudo apt-get update'
                     sshCommand remote: remote, command: 'sudo apt-get install -y chrony'