Back up Jenkins configuration 2020-02-20

Adds submodules in OpenSCAP jobs and adds libyaml-devel due to new yamlfilecontent probe. See OpenSCAP/openscap#1480 Also updates whitelist for SSG PRs.
jan-cerny · Feb 20, 2020 · ae0fd43 · ae0fd43
1 parent ae8152f
commit ae0fd43
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/ansible/jobs/openscap-maint-1.3.xml b/ansible/jobs/openscap-maint-1.3.xml
@@ -32,6 +32,14 @@
     <submoduleCfg class="list"/>
     <extensions>
       <hudson.plugins.git.extensions.impl.CleanCheckout/>
+      <hudson.plugins.git.extensions.impl.SubmoduleOption>
+        <disableSubmodules>false</disableSubmodules>
+        <recursiveSubmodules>true</recursiveSubmodules>
+        <trackingSubmodules>false</trackingSubmodules>
+        <reference></reference>
+        <parentCredentials>false</parentCredentials>
+        <shallow>false</shallow>
+      </hudson.plugins.git.extensions.impl.SubmoduleOption>
     </extensions>
   </scm>
   <assignedNode>fedora || rhel8</assignedNode>

diff --git a/ansible/jobs/openscap-pull-requests-multi.xml b/ansible/jobs/openscap-pull-requests-multi.xml
@@ -47,7 +47,16 @@
     </branches>
     <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
     <submoduleCfg class="list"/>
-    <extensions/>
+    <extensions>
+      <hudson.plugins.git.extensions.impl.SubmoduleOption>
+        <disableSubmodules>false</disableSubmodules>
+        <recursiveSubmodules>true</recursiveSubmodules>
+        <trackingSubmodules>false</trackingSubmodules>
+        <reference></reference>
+        <parentCredentials>false</parentCredentials>
+        <shallow>false</shallow>
+      </hudson.plugins.git.extensions.impl.SubmoduleOption>
+    </extensions>
   </scm>
   <assignedNode>master</assignedNode>
   <canRoam>false</canRoam>

diff --git a/ansible/jobs/scap-security-guide-pull-requests.xml b/ansible/jobs/scap-security-guide-pull-requests.xml
@@ -74,7 +74,7 @@ ggbecker</adminlist>
       <onlyTriggerPhrase>false</onlyTriggerPhrase>
       <useGitHubHooks>true</useGitHubHooks>
       <permitAll>false</permitAll>
-      <whitelist> rchayes iokomin matusmarhefka tedbrunell mildass aghassemlouei ggbecker lkinser jgwl maltek comps keithkjackson adelton justin-stephenson mildas vojtapolasek evgenyz 70k10 shaneboulden abergmann DominiqueDevinci nkinder mralph-rh jcpunk jhrozek redhat-rmcallis isimluk</whitelist>
+      <whitelist> rchayes iokomin matusmarhefka tedbrunell mildass aghassemlouei ggbecker lkinser jgwl maltek comps keithkjackson adelton justin-stephenson mildas vojtapolasek evgenyz 70k10 shaneboulden abergmann DominiqueDevinci nkinder mralph-rh jcpunk jhrozek redhat-rmcallis isimluk pschneiders Scronkfinkle konstruktoid JAORMX mrogers950</whitelist>
       <autoCloseFailedPullRequests>false</autoCloseFailedPullRequests>
       <displayBuildErrorsOnDownstreamBuilds>false</displayBuildErrorsOnDownstreamBuilds>
       <whiteListTargetBranches>

diff --git a/ansible/workers.yml b/ansible/workers.yml
@@ -131,6 +131,7 @@
       - which
       - initscripts
       - chkconfig
+      - libyaml-devel
       state: installed
 
   - name: Ensure OpenSCAP dependencies are installed (Except RHEL8)