Set up casc conditionally (#23)

zhan9san · Oct 25, 2024 · e4c2895 · e4c2895
1 parent 8d54a6a
commit e4c2895
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -42,7 +42,7 @@ jenkins_plugin_file: plugins.txt
 jenkins_plugin_file_path: "{{ jenkins_tool_dir }}/plugins.txt"
 
 # For JCasc
-jenkins_jcasc_template: "jenkins.yml.j2"
+jenkins_jcasc_template: ""
 
 jenkins_ldap_managed_dn: ""
 jenkins_ldap_manager_password_secret: ""

diff --git a/files/plugins.txt b/files/plugins.txt
@@ -8,7 +8,7 @@ buildtriggerbadge:251.vdf6ef853f3f5
 cloudbees-bitbucket-branch-source:888.v8e6d479a_1730
 command-launcher:115.vd8b_301cc15d0
 configuration-as-code:1836.vccda_4a_122a_a_e
-credentials:1371.vfee6b_095f0a_3
+credentials:1378.v81ef4269d764
 credentials-binding:681.vf91669a_32e45
 dashboard-view:2.517.v776a_b_811a_b_4e
 docker-plugin:1.6.2

diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -3,7 +3,8 @@
   hosts: all
   vars:
     jdk_version: 21.0.2
-    java_home: "/opt/jdk-21.0.2"
+    java_home: /opt/jdk-21.0.2
+    jenkins_jcasc_template: jenkins.yaml.j2
     jenkins_systemd_unit_envs:
       java_home: "{{ java_home }}"
   tasks:

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -47,6 +47,7 @@
 - name: Set up JCasc
   ansible.builtin.include_tasks:
     file: "setup-jcasc.yml"
+  when: jenkins_jcasc_template
 
 - name: Set up Seed job
   ansible.builtin.include_tasks:

diff --git a/templates/jenkins.yml.j2 → templates/jenkins.yaml.j2 b/templates/jenkins.yml.j2 → templates/jenkins.yaml.j2