match with the new jenkins configuration

Author: xinredhat

src/api/jenkins/utils/jenkins.utils.ts

@@ -84,14 +84,6 @@ export class JenkinsXmlBuilder {
   <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
-    //TODO: Uncomment this when we have a way to trigger the Jenkins job automatically
-    // <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
-    //   <triggers>
-    //     <com.cloudbees.jenkins.GitHubPushTrigger plugin="${JenkinsConfig.PLUGINS.GITHUB}">
-    //       <spec/>
-    //     </com.cloudbees.jenkins.GitHubPushTrigger>
-    //   </triggers>
-    // </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="${JenkinsConfig.PLUGINS.WORKFLOW_CPS}">
     <scm class="hudson.plugins.git.GitSCM" plugin="${JenkinsConfig.PLUGINS.GIT}">

src/rhtap/modification/jenkinsfile.ts

@@ -23,9 +23,7 @@ export class KubernetesAgentModification implements JenkinsfileModification {
         {
           oldContent: 'agent any',
           newContent:
-            "agent {\n  kubernetes {\n    label 'jenkins-agent'\n    cloud 'openshift'\n    serviceAccount 'jenkins'\n    podRetention onFailure()\n    idleMinutes '5'\n    containerTemplate {\n     name 'jnlp'\n     image '" +
-            this.agentImage +
-            "'\n     ttyEnabled true\n     args '${computer.jnlpmac} ${computer.name}'\n   }\n   }\n}",
+            "agent {\n        label 'tssc-jenkins-agent'    \n}",
         },
       ],
     };