Metal3: Add parameters for mariadb

Parameters for using mariadb and for building the mariadb container
image in metal3-dev-env.
Configure the integration test on mariadb-image to actually use mariadb.

Change-Id: I8cd383961a06fb391a4fbaa12c1a86644568203e

diff --git a/jjb/metal3/defaults.yml b/jjb/metal3/defaults.yml
index ca76832f6c035d57c48142b0478ad18baa8f8964..ca138c71e7d7b97790c8314a1e946e1a2cc6e63d 100644 (file)
--- a/jjb/metal3/defaults.yml
+++ b/jjb/metal3/defaults.yml
@@ -39,5 +39,7 @@
     name: integration-default-values
     <<: *global_defaults
     ironic_install_type: 'rpm'
+    build_mariadb_image_locally: 'false'
+    ironic_use_mariadb: 'false'
     name_postfix: ''
     trigger_postfix: ''

diff --git a/jjb/metal3/job_integration_tests.yml b/jjb/metal3/job_integration_tests.yml
index 20a6ca205f681be56b87a2b3f40994c3578ad642..c72d810ad3bb6ad810b8fd24e929045446d13630 100644 (file)
--- a/jjb/metal3/job_integration_tests.yml
+++ b/jjb/metal3/job_integration_tests.yml
@@ -77,6 +77,13 @@
         name: IRONIC_INSTALL_TYPE
         default: '{ironic_install_type}'
         description: 'Sets the installation type of ironic during ironic-image build of the BMO deployment'
+    - string:
+        name: IRONIC_USE_MARIADB
+        default: '{ironic_use_mariadb}'
+        description: 'If Ironic should use MariaDB or not.'
+    - string:
+        name: BUILD_MARIADB_IMAGE_LOCALLY
+        default: '{build_mariadb_image_locally}'
     properties:
     - build-discarder:
         days-to-keep: 30
@@ -89,7 +96,7 @@
     triggers:
     - github-pull-request:
         admin-list:
-          - '{ci_github_admin_user}'
+        - '{ci_github_admin_user}'
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
@@ -112,7 +119,7 @@
           url: "{ci_github_repo}"
           credentials-id: "{ci_github_jenkins_credentials_id}"
           branches:
-            - '{branch|main}'
+          - '{branch|main}'
           name: 'origin'
           refspec: '+refs/heads/*:refs/remotes/origin/*'
           wipe-workspace: True

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 44313921fb742f98a2d19d6fc9210194dddef002..b662c7f0753e4c2a9a1795844d27341163465578 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -78,6 +78,8 @@
           repo: ironic-ipa-downloader
       - mariadb_image:
           repo: mariadb-image
+          build_mariadb_image_locally: 'true'
+          ironic_use_mariadb: 'true'
     image_os:
       - ubuntu
       - centos