PR#44: Run c3iaas project request and cleanup on master - c3i-library

Michal Kovarik • 4 years ago

cb8eb30

file modified

-20

		`@@ -19,20 +19,6 @@`
		`displayName: A string in cron syntax that defines the frequency to run this job`
		`required: true`
		`value: "H/10 * * * *"`
		`- - name: JENKINS_AGENT_IMAGE`
		`- displayName: Jenkins agent container image`
		`- required: true`
		`- value: docker-registry.upshift.redhat.com/factory2/factory2-integration-test-jenkins-slave:latest`
		`- - name: JENKINS_AGENT_SERVICE_ACCOUNT`
		`- displayName: service account for a Jenkins agent to interact with OpenShift API server`
		`- required: true`
		`- value: jenkins`
		`- - name: JENKINS_AGENT_CLOUD`
		`- displayName: OpenShift cloud to run a Jenkins agent`
		`- required: true`
		`- value: openshift`
		`- - name: JENKINS_AGENT_NAMESPACE`
		`- displayName: OpenShift namespace to run a Jenkins agent`
		`labels:`
		`template: c3iaas-cleanup-projects`
		`app: c3iaas`
		`@@ -52,11 +38,5 @@`
		`library identifier: 'c3i@${GIT_REF}', changelog: false,`
		`retriever: modernSCM([$class: 'GitSCMSource', remote: '${GIT_REPO}'])`
		`c3iaasCleanupProjectsJob(`
		`- agent: [`
		`- cloud: '${JENKINS_AGENT_CLOUD}',`
		`- namespace: '${JENKINS_AGENT_NAMESPACE}',`
		`- serviceAccount: '${JENKINS_AGENT_SERVICE_ACCOUNT}',`
		`- image: '${JENKINS_AGENT_IMAGE}',`
		`- ],`
		`cronExpression: '${CRON_EXPRESSION}',`
		`)`

file modified

-20

		`@@ -15,20 +15,6 @@`
		`displayName: Pipeline Git ref`
		`required: true`
		`value: master`
		`- - name: JENKINS_AGENT_IMAGE`
		`- displayName: Jenkins agent container image`
		`- required: true`
		`- value: docker-registry.upshift.redhat.com/factory2/factory2-integration-test-jenkins-slave:latest`
		`- - name: JENKINS_AGENT_SERVICE_ACCOUNT`
		`- displayName: service account for a Jenkins agent to interact with OpenShift API server`
		`- required: true`
		`- value: jenkins`
		`- - name: JENKINS_AGENT_CLOUD`
		`- displayName: OpenShift cloud to run a Jenkins agent`
		`- required: true`
		`- value: openshift`
		`- - name: JENKINS_AGENT_NAMESPACE`
		`- displayName: OpenShift namespace to run a Jenkins agent`
		`labels:`
		`template: c3ipaas-request-project`
		`app: c3iaas`
		`@@ -71,12 +57,6 @@`
		`library identifier: 'c3i@${GIT_REF}', changelog: false,`
		`retriever: modernSCM([$class: 'GitSCMSource', remote: '${GIT_REPO}'])`
		`c3iaasRequestProjectJob(`
		`- agent: [`
		`- cloud: '${JENKINS_AGENT_CLOUD}',`
		`- namespace: '${JENKINS_AGENT_NAMESPACE}',`
		`- serviceAccount: '${JENKINS_AGENT_SERVICE_ACCOUNT}',`
		`- image: '${JENKINS_AGENT_IMAGE}',`
		`- ],`
		`quota: [`
		`requestsCpu: "16",`
		`limitsCpu: "16",`

vars/c3iaasCleanupProjectsJob.groovy

file modified

+2 -29

		`@@ -14,35 +14,8 @@`
		`buildDiscarder(logRotator(numToKeepStr: '10'))`
		`}`
		`agent {`
		`- kubernetes {`
		`- cloud args.agent.cloud`
		`- label "jenkins-slave-${UUID.randomUUID().toString()}"`
		`- namespace args.agent.namespace`
		`- serviceAccount args.agent.serviceAccount`
		`- defaultContainer 'jnlp'`
		`- yaml """`
		`- apiVersion: v1`
		`- kind: Pod`
		`- metadata:`
		`- labels:`
		`- app: c3iaas`
		`- component: project-manager`
		`- pipeline-job-name: "${env.JOB_BASE_NAME}"`
		`- pipeline-build-number: "${env.BUILD_NUMBER}"`
		`- spec:`
		`- containers:`
		`- - name: jnlp`
		`- image: ${args.agent.image}`
		`- imagePullPolicy: Always`
		`- tty: true`
		`- resources:`
		`- requests:`
		`- memory: 256Mi`
		`- cpu: 200m`
		`- limits:`
		`- memory: 512Mi`
		`- cpu: 356m`
		`- """`
		`+ node {`
		`+ label "master"`
		`}`
		`}`
		`stages {`

vars/c3iaasRequestProjectJob.groovy

file modified

+2 -29

		`@@ -17,35 +17,8 @@`
		`boolean projectCreated;`
		`pipeline {`
		`agent {`
		`- kubernetes {`
		`- cloud args.agent.cloud`
		`- label "jenkins-slave-${UUID.randomUUID().toString()}"`
		`- namespace args.agent.namespace`
		`- serviceAccount args.agent.serviceAccount`
		`- defaultContainer 'jnlp'`
		`- yaml """`
		`- apiVersion: v1`
		`- kind: Pod`
		`- metadata:`
		`- labels:`
		`- app: c3iaas`
		`- component: project-manager`
		`- pipeline-job-name: "${env.JOB_BASE_NAME}"`
		`- pipeline-build-number: "${env.BUILD_NUMBER}"`
		`- spec:`
		`- containers:`
		`- - name: jnlp`
		`- image: ${args.agent.image}`
		`- imagePullPolicy: Always`
		`- tty: true`
		`- resources:`
		`- requests:`
		`- memory: 256Mi`
		`- cpu: 200m`
		`- limits:`
		`- memory: 512Mi`
		`- cpu: 356m`
		`- """`
		`+ node {`
		`+ label "master"`
		`}`
		`}`
		`stages {`