RHEL8 mode and backup jobs

I have fixed the RHEL 8 node and then I tried to reflect the changes on the node in our Playbook. But I don't know how to generate a Playbook from a node, so I have updated the Playbook manually. Also, I have enabled RHEL 8 node in some jobs. I backup the jobs configuration to the git repository.
OpenSCAP · Jun 4, 2019 · 2fd810c · 2fd810c
1 parent a0143a0
commit 2fd810c
Show file tree

Hide file tree

Showing 11 changed files with 353 additions and 52 deletions.
diff --git a/ansible/inventory.ini b/ansible/inventory.ini
@@ -8,9 +8,11 @@ jenkins-worker-rhel6-1 ansible_host=89.221.216.211 ansible_user=openscap-admin
 [worker_rhel7]
 jenkins-worker-rhel7-1 ansible_host=89.221.216.210 ansible_user=openscap-admin
 
+[worker_rhel8]
+jenkins-worker-rhel8-1 ansible_host=89.221.217.14 ansible_user=openscap-admin ansible_python_interpreter=/usr/bin/python3
+
 [worker_fedora]
 jenkins-worker-fedora-1 ansible_host=89.221.216.149 ansible_user=openscap-admin
-jenkins-worker-fedora-2 ansible_host=89.221.217.14 ansible_user=openscap-admin
 
 [all:vars]
 ansible_connection=ssh
diff --git a/ansible/jobs/openscap-maint-1.2-pull-requests-multi.xml b/ansible/jobs/openscap-maint-1.2-pull-requests-multi.xml
@@ -0,0 +1,191 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<matrix-project plugin="[email protected]">
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>-1</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>-1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
+    <com.coravy.hudson.plugins.github.GithubProjectProperty plugin="[email protected]">
+      <projectUrl>https://github.com/OpenSCAP/openscap/</projectUrl>
+      <displayName></displayName>
+    </com.coravy.hudson.plugins.github.GithubProjectProperty>
+    <org.bstick12.jenkinsci.plugins.leastload.LeastLoadDisabledProperty plugin="[email protected]">
+      <leastLoadDisabled>false</leastLoadDisabled>
+    </org.bstick12.jenkinsci.plugins.leastload.LeastLoadDisabledProperty>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>sha1</name>
+          <description>origin/pr/#PR/head</description>
+          <defaultValue>origin/pr/1/head</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.plugins.git.GitSCM" plugin="[email protected]">
+    <configVersion>2</configVersion>
+    <userRemoteConfigs>
+      <hudson.plugins.git.UserRemoteConfig>
+        <name>origin</name>
+        <refspec>+refs/pull/*:refs/remotes/origin/pr/*</refspec>
+        <url>git://github.com/OpenSCAP/openscap.git</url>
+        <credentialsId>openscap-ci</credentialsId>
+      </hudson.plugins.git.UserRemoteConfig>
+    </userRemoteConfigs>
+    <branches>
+      <hudson.plugins.git.BranchSpec>
+        <name>${sha1}</name>
+      </hudson.plugins.git.BranchSpec>
+    </branches>
+    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+    <submoduleCfg class="list"/>
+    <extensions/>
+  </scm>
+  <assignedNode>master</assignedNode>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers>
+    <org.jenkinsci.plugins.ghprb.GhprbTrigger plugin="[email protected]">
+      <spec>H/5 * * * *</spec>
+      <configVersion>3</configVersion>
+      <adminlist>shawndwells
+jan-cerny
+mpreisler
+dahaic
+yuumasato
+redhatrises
+cipherboy
+matejak
+matusmarhefka</adminlist>
+      <allowMembersOfWhitelistedOrgsAsAdmin>false</allowMembersOfWhitelistedOrgsAsAdmin>
+      <orgslist></orgslist>
+      <cron>H/5 * * * *</cron>
+      <buildDescTemplate></buildDescTemplate>
+      <onlyTriggerPhrase>false</onlyTriggerPhrase>
+      <useGitHubHooks>true</useGitHubHooks>
+      <permitAll>false</permitAll>
+      <whitelist>isimluk                                                        
+dkopecek                                                                        
+mpreisler                                                                       
+pvrabec                                                                         
+theinric                                                                        
+jan-cerny                                                                       
+bachradsusi                                                                     
+ybznek                                                                          
+msrubar                                                                         
+mtrmac                                                                          
+fslavin                                                                         
+jacobvar                                                                        
+iankko                                                                          
+rwmjones                                                                        
+Jakuje                                                                          
+chifflier                                                                       
+iljakuklic                                                                      
+redhatrises                                                                     
+shawndwells                                                                     
+gregelin                                                                        
+baude                                                                           
+rladkins                                                                        
+mgrepl                                                                          
+msmeissn                                                                        
+openprivacy                                                                     
+bushong1                                                                        
+zemb                                                                            
+jokajak                                                                         
+radzy                                                                           
+yuumasato rsprudencio GautamSatish dahaic Hexadorsimal matusmarhefka kjankov jlcharton matejak JennyUWaterloo cipherboy abergmann mildass teselkin ggbecker iokomin evgenyz</whitelist>
+      <autoCloseFailedPullRequests>false</autoCloseFailedPullRequests>
+      <displayBuildErrorsOnDownstreamBuilds>false</displayBuildErrorsOnDownstreamBuilds>
+      <whiteListTargetBranches>
+        <org.jenkinsci.plugins.ghprb.GhprbBranch>
+          <branch>maint-1.2</branch>
+        </org.jenkinsci.plugins.ghprb.GhprbBranch>
+      </whiteListTargetBranches>
+      <blackListTargetBranches>
+        <org.jenkinsci.plugins.ghprb.GhprbBranch>
+          <branch>master</branch>
+        </org.jenkinsci.plugins.ghprb.GhprbBranch>
+        <org.jenkinsci.plugins.ghprb.GhprbBranch>
+          <branch>maint-1.3</branch>
+        </org.jenkinsci.plugins.ghprb.GhprbBranch>
+        <org.jenkinsci.plugins.ghprb.GhprbBranch>
+          <branch></branch>
+        </org.jenkinsci.plugins.ghprb.GhprbBranch>
+      </blackListTargetBranches>
+      <triggerPhrase></triggerPhrase>
+      <skipBuildPhrase>.*\[skip\W+ci\].*</skipBuildPhrase>
+      <blackListCommitAuthor></blackListCommitAuthor>
+      <blackListLabels></blackListLabels>
+      <whiteListLabels></whiteListLabels>
+      <includedRegions></includedRegions>
+      <excludedRegions></excludedRegions>
+      <extensions>
+        <org.jenkinsci.plugins.ghprb.extensions.status.GhprbSimpleStatus>
+          <commitStatusContext></commitStatusContext>
+          <triggeredStatus></triggeredStatus>
+          <startedStatus></startedStatus>
+          <statusUrl></statusUrl>
+          <addTestResults>false</addTestResults>
+        </org.jenkinsci.plugins.ghprb.extensions.status.GhprbSimpleStatus>
+        <org.jenkinsci.plugins.ghprb.extensions.build.GhprbCancelBuildsOnUpdate>
+          <overrideGlobal>false</overrideGlobal>
+        </org.jenkinsci.plugins.ghprb.extensions.build.GhprbCancelBuildsOnUpdate>
+      </extensions>
+    </org.jenkinsci.plugins.ghprb.GhprbTrigger>
+  </triggers>
+  <concurrentBuild>true</concurrentBuild>
+  <axes>
+    <hudson.matrix.LabelAxis>
+      <name>label</name>
+      <values>
+        <string>fedora</string>
+        <string>rhel6</string>
+        <string>rhel7</string>
+        <string>rhel8</string>
+      </values>
+    </hudson.matrix.LabelAxis>
+  </axes>
+  <builders>
+    <com.cloudbees.jenkins.GitHubSetCommitStatusBuilder plugin="[email protected]">
+      <statusMessage>
+        <content></content>
+      </statusMessage>
+      <contextSource class="org.jenkinsci.plugins.github.status.sources.DefaultCommitContextSource"/>
+    </com.cloudbees.jenkins.GitHubSetCommitStatusBuilder>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash
+ulimit -c unlimited
+git clean -xfd
+
+export VERBOSE=yes  # The test suite output should be more helpful
+./autogen.sh
+source &lt;( rpm --eval &apos;%configure --enable-sce&apos; )
+make -j $CPU_COUNT 
+make distcheck -j $CPU_COUNT -k AM_COLOR_TESTS=always</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers/>
+  <buildWrappers>
+    <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="[email protected]">
+      <colorMapName>css</colorMapName>
+    </hudson.plugins.ansicolor.AnsiColorBuildWrapper>
+    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="[email protected]">
+      <template>${GIT_BRANCH} - #${BUILD_NUMBER}</template>
+      <runAtStart>true</runAtStart>
+      <runAtEnd>true</runAtEnd>
+    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
+  </buildWrappers>
+  <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
+    <runSequentially>false</runSequentially>
+  </executionStrategy>
+</matrix-project>
diff --git a/ansible/jobs/openscap-maint-1.3.xml b/ansible/jobs/openscap-maint-1.3.xml
@@ -34,7 +34,7 @@
       <hudson.plugins.git.extensions.impl.CleanCheckout/>
     </extensions>
   </scm>
-  <assignedNode>fedora</assignedNode>
+  <assignedNode>fedora || rhel8</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -44,7 +44,7 @@
       <spec></spec>
     </com.cloudbees.jenkins.GitHubPushTrigger>
   </triggers>
-  <concurrentBuild>false</concurrentBuild>
+  <concurrentBuild>true</concurrentBuild>
   <builders>
     <hudson.plugins.cmake.CmakeBuilder plugin="[email protected]">
       <installationName>InSearchPath</installationName>

diff --git a/ansible/jobs/openscap-master.xml b/ansible/jobs/openscap-master.xml
@@ -16,7 +16,7 @@
       <leastLoadDisabled>false</leastLoadDisabled>
     </org.bstick12.jenkinsci.plugins.leastload.LeastLoadDisabledProperty>
   </properties>
-  <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.1">
+  <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
     <configVersion>2</configVersion>
     <userRemoteConfigs>
       <hudson.plugins.git.UserRemoteConfig>
@@ -34,13 +34,13 @@
       <hudson.plugins.git.extensions.impl.CleanCheckout/>
     </extensions>
   </scm>
-  <assignedNode>fedora</assignedNode>
+  <assignedNode>fedora || rhel8</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers>
-    <com.cloudbees.jenkins.GitHubPushTrigger plugin="[email protected].2">
+    <com.cloudbees.jenkins.GitHubPushTrigger plugin="[email protected].3">
       <spec></spec>
     </com.cloudbees.jenkins.GitHubPushTrigger>
   </triggers>
@@ -76,7 +76,7 @@ rm -rf &quot;$WORKSPACE/build&quot;</command>
   </builders>
   <publishers/>
   <buildWrappers>
-    <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.5.2">
+    <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.6.2">
       <colorMapName>xterm</colorMapName>
     </hudson.plugins.ansicolor.AnsiColorBuildWrapper>
   </buildWrappers>

diff --git a/ansible/jobs/openscap-parametrized.xml b/ansible/jobs/openscap-parametrized.xml
@@ -39,13 +39,14 @@
             <a class="string-array">
               <string>master</string>
               <string>maint-1.2</string>
+              <string>maint-1.3</string>
             </a>
           </choices>
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
   </properties>
-  <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.1">
+  <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
     <configVersion>2</configVersion>
     <userRemoteConfigs>
       <hudson.plugins.git.UserRemoteConfig>
@@ -87,7 +88,7 @@ fi</command>
   </builders>
   <publishers/>
   <buildWrappers>
-    <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.5.2">
+    <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.6.2">
       <colorMapName>xterm</colorMapName>
     </hudson.plugins.ansicolor.AnsiColorBuildWrapper>
   </buildWrappers>

diff --git a/ansible/jobs/openscap-pull-requests-multi.xml b/ansible/jobs/openscap-pull-requests-multi.xml
@@ -103,21 +103,18 @@ bushong1
 zemb                                                                            
 jokajak                                                                         
 radzy                                                                           
-yuumasato rsprudencio GautamSatish dahaic Hexadorsimal matusmarhefka kjankov jlcharton matejak JennyUWaterloo cipherboy abergmann mildass teselkin ggbecker iokomin</whitelist>
+yuumasato rsprudencio GautamSatish dahaic Hexadorsimal matusmarhefka kjankov jlcharton matejak JennyUWaterloo cipherboy abergmann mildass teselkin ggbecker iokomin evgenyz</whitelist>
       <autoCloseFailedPullRequests>false</autoCloseFailedPullRequests>
       <displayBuildErrorsOnDownstreamBuilds>false</displayBuildErrorsOnDownstreamBuilds>
       <whiteListTargetBranches>
-        <org.jenkinsci.plugins.ghprb.GhprbBranch>
-          <branch>maint-1.2</branch>
-        </org.jenkinsci.plugins.ghprb.GhprbBranch>
-      </whiteListTargetBranches>
-      <blackListTargetBranches>
         <org.jenkinsci.plugins.ghprb.GhprbBranch>
           <branch>master</branch>
         </org.jenkinsci.plugins.ghprb.GhprbBranch>
         <org.jenkinsci.plugins.ghprb.GhprbBranch>
           <branch>maint-1.3</branch>
         </org.jenkinsci.plugins.ghprb.GhprbBranch>
+      </whiteListTargetBranches>
+      <blackListTargetBranches>
         <org.jenkinsci.plugins.ghprb.GhprbBranch>
           <branch></branch>
         </org.jenkinsci.plugins.ghprb.GhprbBranch>
@@ -149,8 +146,8 @@ yuumasato rsprudencio GautamSatish dahaic Hexadorsimal matusmarhefka kjankov jlc
       <name>label</name>
       <values>
         <string>fedora</string>
-        <string>rhel6</string>
         <string>rhel7</string>
+        <string>rhel8</string>
       </values>
     </hudson.matrix.LabelAxis>
   </axes>
@@ -161,16 +158,30 @@ yuumasato rsprudencio GautamSatish dahaic Hexadorsimal matusmarhefka kjankov jlc
       </statusMessage>
       <contextSource class="org.jenkinsci.plugins.github.status.sources.DefaultCommitContextSource"/>
     </com.cloudbees.jenkins.GitHubSetCommitStatusBuilder>
+    <hudson.plugins.cmake.CmakeBuilder plugin="[email protected]">
+      <installationName>InSearchPath</installationName>
+      <workingDir>build</workingDir>
+      <generator>${BUILD_BACKEND}</generator>
+      <sourceDir>.</sourceDir>
+      <buildType>Debug</buildType>
+      <cleanBuild>true</cleanBuild>
+      <toolSteps>
+        <hudson.plugins.cmake.BuildToolStep>
+          <args>all</args>
+          <withCmake>false</withCmake>
+        </hudson.plugins.cmake.BuildToolStep>
+      </toolSteps>
+    </hudson.plugins.cmake.CmakeBuilder>
+    <hudson.plugins.cmake.CToolBuilder plugin="[email protected]">
+      <installationName>InSearchPath</installationName>
+      <workingDir>build</workingDir>
+      <toolArgs>--output-on-failure</toolArgs>
+      <toolId>ctest</toolId>
+    </hudson.plugins.cmake.CToolBuilder>
     <hudson.tasks.Shell>
       <command>#!/bin/bash
-ulimit -c unlimited
-git clean -xfd
-
-export VERBOSE=yes  # The test suite output should be more helpful
-./autogen.sh
-source &lt;( rpm --eval &apos;%configure --enable-sce&apos; )
-make -j $CPU_COUNT 
-make distcheck -j $CPU_COUNT -k AM_COLOR_TESTS=always</command>
+# Clean up the build directory
+rm -rf &quot;$WORKSPACE/build&quot;</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers/>

diff --git a/ansible/jobs/scap-security-guide-pull-requests.xml b/ansible/jobs/scap-security-guide-pull-requests.xml
@@ -73,7 +73,7 @@ matejak</adminlist>
       <onlyTriggerPhrase>false</onlyTriggerPhrase>
       <useGitHubHooks>true</useGitHubHooks>
       <permitAll>false</permitAll>
-      <whitelist> rchayes iokomin matusmarhefka tedbrunell mildass aghassemlouei ggbecker lkinser jgwl maltek</whitelist>
+      <whitelist> rchayes iokomin matusmarhefka tedbrunell mildass aghassemlouei ggbecker lkinser jgwl maltek comps keithkjackson</whitelist>
       <autoCloseFailedPullRequests>false</autoCloseFailedPullRequests>
       <displayBuildErrorsOnDownstreamBuilds>false</displayBuildErrorsOnDownstreamBuilds>
       <whiteListTargetBranches>
@@ -115,6 +115,7 @@ matejak</adminlist>
         <string>fedora</string>
         <string>rhel6</string>
         <string>rhel7</string>
+        <string>rhel8</string>
       </values>
     </hudson.matrix.LabelAxis>
   </axes>