sts-sponsors team mailing list archive

[Adam Collard <mp+434493@xxxxxxxxxxxxxxxxxx>]

Adam Collard has proposed merging ~adam-collard/maas-ci/+git/maas-ci-config:tls-sync into ~maas-committers/maas-ci/+git/maas-ci-config:master.

Commit message:
Fix TLS configuration, rename labmaas_base_config.yaml



Requested reviews:
  MAAS Committers (maas-committers)

For more details, see:
https://code.launchpad.net/~adam-collard/maas-ci/+git/maas-ci-config/+merge/434493
-- 
Your team MAAS Committers is requested to review the proposed merge of ~adam-collard/maas-ci/+git/maas-ci-config:tls-sync into ~maas-committers/maas-ci/+git/maas-ci-config:master.

diff --git a/jenkins/jobs/labmaas_base_config.yaml b/jenkins/jobs/labmaas_base_config.inc
similarity index 88%
rename from jenkins/jobs/labmaas_base_config.yaml
rename to jenkins/jobs/labmaas_base_config.inc
index 8902ce1..a68786a 100644
--- a/jenkins/jobs/labmaas_base_config.yaml
+++ b/jenkins/jobs/labmaas_base_config.inc
@@ -32,9 +32,7 @@ o11y:
     o11y_ip: 10.245.136.5
 
 tls:
-    key: /home/ubuntu/system_tests_assets/tls_certificates/server-maas-under-test-key.pem
-    cert: /home/ubuntu/system_tests_assets/tls_certificates/server-maas-under-test.pem
-    cacerts: /home/ubuntu/system_tests_assets/tls_certificates/cacerts.pem
+    cacerts: ssl-cert-snakeoil.pem
 
 containers-image: ${params.CONTAINERS_IMAGE}
 
diff --git a/jenkins/jobs/systemtests.yaml b/jenkins/jobs/systemtests.yaml
index 58a9321..fb4f879 100644
--- a/jenkins/jobs/systemtests.yaml
+++ b/jenkins/jobs/systemtests.yaml
@@ -91,9 +91,10 @@
       windows_image_file_path: /home/ubuntu/other-os-images/windows-win2012hvr2-amd64-root-dd
 
       tls:
-          key: /home/ubuntu/system_tests_assets/tls_certificates/server-maas-under-test-key.pem
-          cert: /home/ubuntu/system_tests_assets/tls_certificates/server-maas-under-test.pem
-          cacerts: /home/ubuntu/system_tests_assets/tls_certificates/cacerts.pem
+          cacerts: ssl-cert-snakeoil.pem
+
+      vault:
+          snap-channel: 1.11/stable
 
       containers-image: ${params.CONTAINERS_IMAGE}
 
diff --git a/jenkins/jobs/systemtests_config_generator.yaml b/jenkins/jobs/systemtests_config_generator.yaml
index 20ad096..e0b5944 100644
--- a/jenkins/jobs/systemtests_config_generator.yaml
+++ b/jenkins/jobs/systemtests_config_generator.yaml
@@ -79,4 +79,4 @@
           projects: "maas-system-tests-executor*"
     dsl: !include-jinja2: systemtests_config_generator.groovy
 
-    labmaas_base_config: !include-jinja2: labmaas_base_config.yaml
\ No newline at end of file
+    labmaas_base_config: !include-jinja2: labmaas_base_config.inc
diff --git a/jenkins/jobs/systemtests_snap.yaml b/jenkins/jobs/systemtests_snap.yaml
index eb907d7..c8bd192 100644
--- a/jenkins/jobs/systemtests_snap.yaml
+++ b/jenkins/jobs/systemtests_snap.yaml
@@ -91,9 +91,10 @@
       windows_image_file_path: /home/ubuntu/other-os-images/windows-win2012hvr2-amd64-root-dd
 
       tls:
-          key: /home/ubuntu/system_tests_assets/tls_certificates/server-maas-under-test-key.pem
-          cert: /home/ubuntu/system_tests_assets/tls_certificates/server-maas-under-test.pem
-          cacerts: /home/ubuntu/system_tests_assets/tls_certificates/cacerts.pem
+          cacerts: ssl-cert-snakeoil.pem
+
+      vault:
+          snap-channel: 1.11/stable
 
       containers-image: ${params.CONTAINERS_IMAGE}
 
diff --git a/jenkins/jobs/systemtests_v3.yaml b/jenkins/jobs/systemtests_v3.yaml
index 056054f..c159c2d 100644
--- a/jenkins/jobs/systemtests_v3.yaml
+++ b/jenkins/jobs/systemtests_v3.yaml
@@ -108,9 +108,10 @@
       windows_image_file_path: /home/ubuntu/other-os-images/windows-win2012hvr2-amd64-root-dd
 
       tls:
-          key: /home/ubuntu/system_tests_assets/tls_certificates/server-maas-under-test-key.pem
-          cert: /home/ubuntu/system_tests_assets/tls_certificates/server-maas-under-test.pem
-          cacerts: /home/ubuntu/system_tests_assets/tls_certificates/cacerts.pem
+          cacerts: ssl-cert-snakeoil.pem
+
+      vault:
+          snap-channel: 1.11/stable
 
       containers-image: ${params.CONTAINERS_IMAGE}