sts-sponsors team mailing list archive
-
sts-sponsors team
-
Mailing list archive
-
Message #08690
[Merge] ~lloydwaltersj/maas-ci/+git/maas-ci-config:fix-gen-config into ~maas-committers/maas-ci/+git/maas-ci-config:master
Jack Lloyd-Walters has proposed merging ~lloydwaltersj/maas-ci/+git/maas-ci-config:fix-gen-config into ~maas-committers/maas-ci/+git/maas-ci-config:master.
Commit message:
add empty image_mapping to gen_config to allow it to pass
Requested reviews:
MAAS Committers (maas-committers)
For more details, see:
https://code.launchpad.net/~lloydwaltersj/maas-ci/+git/maas-ci-config/+merge/443573
--
Your team MAAS Committers is requested to review the proposed merge of ~lloydwaltersj/maas-ci/+git/maas-ci-config:fix-gen-config into ~maas-committers/maas-ci/+git/maas-ci-config:master.
diff --git a/jenkins/jobs/ansible_collection.yaml b/jenkins/jobs/ansible_collection.yaml
index 2487e28..bff14f5 100644
--- a/jenkins/jobs/ansible_collection.yaml
+++ b/jenkins/jobs/ansible_collection.yaml
@@ -14,7 +14,7 @@
parameters:
- string:
name: TARGET_REPO
- description: Git repo to merge Ansible Collections into
+ description: Git repo url to merge Ansible Collections into
default: https://github.com/maas/ansible-collection
- string:
name: JOB_NAME
@@ -32,17 +32,13 @@
parameters:
- string:
name: GH_REPO
- description: 'Github repo to clone'
- default: 'ansible-collection'
+ description: 'Github url of the repo to clone'
+ default: 'https://github.com/maas/ansible-collection'
- string:
name: GH_BRANCH
description: 'Github branch to clone'
default: 'main'
- string:
- name: GH_ORG
- description: 'Github org that owns the repo to clone'
- default: 'maas'
- - string:
name: SERIES
description: 'The Ubuntu series to build and with'
default: '22.04'
diff --git a/jenkins/jobs/labmaas_image_mapping.inc b/jenkins/jobs/labmaas_image_mapping.inc
new file mode 100644
index 0000000..f7f6b9b
--- /dev/null
+++ b/jenkins/jobs/labmaas_image_mapping.inc
@@ -0,0 +1 @@
+images:
diff --git a/jenkins/jobs/systemtests_config_generator.groovy b/jenkins/jobs/systemtests_config_generator.groovy
index 6d7d210..7060d90 100644
--- a/jenkins/jobs/systemtests_config_generator.groovy
+++ b/jenkins/jobs/systemtests_config_generator.groovy
@@ -39,6 +39,11 @@ pipeline {
{{ labmaas_base_config.format() }}
"""
}
+ script {
+ writeFile file: 'system-tests/image_mapping.yaml', text: """
+{{ labmaas_image_mapping.format() }}
+"""
+ }
}
}
stage('Generate configuration') {
@@ -61,11 +66,10 @@ pipeline {
if (params.GEN_CONFIG_ARGS) {
gen_config_cmd = "${gen_config_cmd} ${params.GEN_CONFIG_ARGS}"
}
-
sh """
cd system-tests
cat base_config.yaml
- ${gen_config_cmd} --containers-image=${params.CONTAINERS_IMAGE} base_config.yaml config.yaml
+ ${gen_config_cmd} --containers-image=${params.CONTAINERS_IMAGE} base_config.yaml config.yaml image_mapping.yaml
"""
archiveArtifacts artifacts: 'system-tests/config.yaml', fingerprint: true
diff --git a/jenkins/jobs/systemtests_config_generator.yaml b/jenkins/jobs/systemtests_config_generator.yaml
index f8ee769..f8389a8 100644
--- a/jenkins/jobs/systemtests_config_generator.yaml
+++ b/jenkins/jobs/systemtests_config_generator.yaml
@@ -80,3 +80,4 @@
dsl: !include-jinja2: systemtests_config_generator.groovy
labmaas_base_config: !include-jinja2: labmaas_base_config.inc
+ labmaas_image_mapping: !include-jinja2: labmaas_image_mapping.inc
Follow ups