canonical-hw-cert team mailing list archive

Thread
Date

[Merge] ~pwlars/hwcert-jenkins-jobs:fix-kinetic-rpi-url into hwcert-jenkins-jobs:master

To: mp+430244@xxxxxxxxxxxxxxxxxx
From: Paul Larson <mp+430244@xxxxxxxxxxxxxxxxxx>
Date: Wed, 21 Sep 2022 18:31:13 -0000
In-reply-to: <166378504004.14541.5395322753086690273.launchpad@juju-4112d9-prod-launchpad-manual-servers-36.openstack.prodstack5.lan>
Reply-to: mp+430244@xxxxxxxxxxxxxxxxxx
Sender: noreply@xxxxxxxxxxxxx

Paul Larson has proposed merging ~pwlars/hwcert-jenkins-jobs:fix-kinetic-rpi-url into hwcert-jenkins-jobs:master.

Requested reviews:
  hwcert-jenkins (hwcert-jenkins)

For more details, see:
https://code.launchpad.net/~pwlars/hwcert-jenkins-jobs/+git/hwcert-jenkins-jobs/+merge/430244

kinetic server image testing on rpi won't run without this. I've already pushed it to the jenkins server. There's a known bug right now, so the images don't work correctly at the moment, but this will fix the tests so that they run every day at least
-- 
Your team hwcert-jenkins is requested to review the proposed merge of ~pwlars/hwcert-jenkins-jobs:fix-kinetic-rpi-url into hwcert-jenkins-jobs:master.

diff --git a/jobs/image-testing/projects/cm3-server.yaml b/jobs/image-testing/projects/cm3-server.yaml
index 600a963..598f3ee 100644
--- a/jobs/image-testing/projects/cm3-server.yaml
+++ b/jobs/image-testing/projects/cm3-server.yaml
@@ -47,14 +47,14 @@
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: arm64
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-arm64+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-arm64\+raspi\.img\.xz
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: armhf
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-armhf+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-armhf\+raspi\.img\.xz
diff --git a/jobs/image-testing/projects/cm3p-server.yaml b/jobs/image-testing/projects/cm3p-server.yaml
index 2544168..b9ab0ac 100644
--- a/jobs/image-testing/projects/cm3p-server.yaml
+++ b/jobs/image-testing/projects/cm3p-server.yaml
@@ -47,14 +47,14 @@
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: arm64
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-arm64+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-arm64\+raspi\.img\.xz
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: armhf
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-armhf+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-armhf\+raspi\.img\.xz
diff --git a/jobs/image-testing/projects/rpi2-server.yaml b/jobs/image-testing/projects/rpi2-server.yaml
index 01709c7..2411690 100644
--- a/jobs/image-testing/projects/rpi2-server.yaml
+++ b/jobs/image-testing/projects/rpi2-server.yaml
@@ -36,7 +36,7 @@
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: armhf
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-armhf+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-armhf\+raspi\.img\.xz
diff --git a/jobs/image-testing/projects/rpi3-server.yaml b/jobs/image-testing/projects/rpi3-server.yaml
index 53e9357..bc55e0a 100644
--- a/jobs/image-testing/projects/rpi3-server.yaml
+++ b/jobs/image-testing/projects/rpi3-server.yaml
@@ -58,14 +58,14 @@
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: arm64
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-arm64+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-arm64\+raspi\.img\.xz
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: armhf
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-armhf+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-armhf\+raspi\.img\.xz
diff --git a/jobs/image-testing/projects/rpi3aplus-server.yaml b/jobs/image-testing/projects/rpi3aplus-server.yaml
index cca9ac7..a4f7d6e 100644
--- a/jobs/image-testing/projects/rpi3aplus-server.yaml
+++ b/jobs/image-testing/projects/rpi3aplus-server.yaml
@@ -57,14 +57,14 @@
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: arm64
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-arm64+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-arm64\+raspi\.img\.xz
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: armhf
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-armhf+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-armhf\+raspi\.img\.xz
diff --git a/jobs/image-testing/projects/rpi3bplus-server.yaml b/jobs/image-testing/projects/rpi3bplus-server.yaml
index 60f96c0..505ad50 100644
--- a/jobs/image-testing/projects/rpi3bplus-server.yaml
+++ b/jobs/image-testing/projects/rpi3bplus-server.yaml
@@ -58,14 +58,14 @@
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: arm64
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-arm64+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-arm64\+raspi\.img\.xz
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: armhf
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-armhf+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-armhf\+raspi\.img\.xz
diff --git a/jobs/image-testing/projects/rpi400-server.yaml b/jobs/image-testing/projects/rpi400-server.yaml
index 5e6339c..6680a62 100644
--- a/jobs/image-testing/projects/rpi400-server.yaml
+++ b/jobs/image-testing/projects/rpi400-server.yaml
@@ -56,14 +56,14 @@
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: arm64
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-arm64+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-arm64\+raspi\.img\.xz
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: armhf
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-armhf+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-armhf\+raspi\.img\.xz
diff --git a/jobs/image-testing/projects/rpi4b1g-server.yaml b/jobs/image-testing/projects/rpi4b1g-server.yaml
index abcb572..f0b52f1 100644
--- a/jobs/image-testing/projects/rpi4b1g-server.yaml
+++ b/jobs/image-testing/projects/rpi4b1g-server.yaml
@@ -56,14 +56,14 @@
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: arm64
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-arm64+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-arm64\+raspi\.img\.xz
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: armhf
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-armhf+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-armhf\+raspi\.img\.xz
diff --git a/jobs/image-testing/projects/rpi4b2g-server.yaml b/jobs/image-testing/projects/rpi4b2g-server.yaml
index 3adf7af..c4a4e43 100644
--- a/jobs/image-testing/projects/rpi4b2g-server.yaml
+++ b/jobs/image-testing/projects/rpi4b2g-server.yaml
@@ -56,14 +56,14 @@
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: arm64
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-arm64+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-arm64\+raspi\.img\.xz
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: armhf
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-armhf+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-armhf\+raspi\.img\.xz
diff --git a/jobs/image-testing/projects/rpi4b4g-server.yaml b/jobs/image-testing/projects/rpi4b4g-server.yaml
index 291d234..166f9e6 100644
--- a/jobs/image-testing/projects/rpi4b4g-server.yaml
+++ b/jobs/image-testing/projects/rpi4b4g-server.yaml
@@ -56,14 +56,14 @@
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: arm64
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-arm64+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-arm64\+raspi\.img\.xz
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: armhf
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-armhf+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-armhf\+raspi\.img\.xz
diff --git a/jobs/image-testing/projects/rpi4b8g-server.yaml b/jobs/image-testing/projects/rpi4b8g-server.yaml
index 31fa794..bdfebf5 100644
--- a/jobs/image-testing/projects/rpi4b8g-server.yaml
+++ b/jobs/image-testing/projects/rpi4b8g-server.yaml
@@ -54,14 +54,14 @@
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: arm64
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-arm64+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-arm64\+raspi\.img\.xz
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: armhf
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-armhf+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-armhf\+raspi\.img\.xz
diff --git a/jobs/image-testing/projects/rpicm4l-server.yaml b/jobs/image-testing/projects/rpicm4l-server.yaml
index 922c6b3..c1401ba 100644
--- a/jobs/image-testing/projects/rpicm4l-server.yaml
+++ b/jobs/image-testing/projects/rpicm4l-server.yaml
@@ -56,14 +56,14 @@
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: arm64
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-arm64+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-arm64\+raspi\.img\.xz
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: armhf
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-armhf+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-armhf\+raspi\.img\.xz
diff --git a/jobs/image-testing/projects/rpiz2-server.yaml b/jobs/image-testing/projects/rpiz2-server.yaml
index 8ef07f9..2fef97b 100644
--- a/jobs/image-testing/projects/rpiz2-server.yaml
+++ b/jobs/image-testing/projects/rpiz2-server.yaml
@@ -58,14 +58,14 @@
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: arm64
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-arm64+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-arm64\+raspi\.img\.xz
       - '{prefix}-{device}-{image-type}-server-{arch}-image':
           image-type: kinetic
           arch: armhf
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
+          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/pending/
           image_file: kinetic-preinstalled-server-armhf+raspi.img.xz
           image_channel: kinetic
           escaped_image_file: kinetic-preinstalled-server-armhf\+raspi\.img\.xz

References

[Merge] ~pwlars/hwcert-jenkins-jobs:fix-kinetic-rpi-url into hwcert-jenkins-jobs:master
From: Paul Larson, 2022-09-21