Skip to content

Commit

Permalink
Merge pull request #310 from marklise/31-mem-admin
Browse files Browse the repository at this point in the history
FLCN-31: Remove locally hosted sonarcube
  • Loading branch information
marklise authored Aug 24, 2020
2 parents eb91f12 + 00db59c commit df14375
Show file tree
Hide file tree
Showing 11 changed files with 0 additions and 508 deletions.
5 changes: 0 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,6 @@ buildprod.sh
runit.sh
runprod.sh

# Sonar Runner
# ============
/sonar-runner/.gradle
/sonar-runner/build

# Automated Functional Tests
# ============
**/.gradle
34 changes: 0 additions & 34 deletions Jenkinsfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -110,40 +110,6 @@ node('master') {
}
}

podTemplate(label: 'sonarqube-maven', name: 'sonarqube-maven', serviceAccount: 'jenkins', cloud: 'openshift', containers: [
containerTemplate(
name: 'jnlp',
image: 'registry.access.redhat.com/openshift3/jenkins-slave-maven-rhel7',
resourceRequestCpu: '500m',
resourceLimitCpu: '1000m',
resourceRequestMemory: '1Gi',
resourceLimitMemory: '4Gi',
workingDir: '/tmp',
command: '',
args: '${computer.jnlpmac} ${computer.name}'
)
])
{
stage('Code Quality Check') {
node('sonarqube-maven'){
//the checkout is mandatory, otherwise code quality check would fail
echo "checking out source"
echo "Build: ${BUILD_ID}"
checkout scm
SONARQUBE_URL = sh (
script: 'oc get routes -o wide --no-headers | awk \'/sonarqube/{ print match($0,/edge/) ? "https://"$2 : "http://"$2 }\'',
returnStdout: true
).trim()
echo "SONARQUBE_URL: ${SONARQUBE_URL}"
dir('sonar-runner') {
try {
sh returnStdout: true, script: "./gradlew sonarqube -Dsonar.host.url=${SONARQUBE_URL} -Dsonar.verbose=true --stacktrace --info"
} finally { }
}
}
}
}

node('master'){
/*
* Extract secrets and create relevant environment variables.
Expand Down
22 changes: 0 additions & 22 deletions sonar-runner/README.md

This file was deleted.

93 changes: 0 additions & 93 deletions sonar-runner/build.gradle

This file was deleted.

11 changes: 0 additions & 11 deletions sonar-runner/gradle/ci.gradle

This file was deleted.

12 changes: 0 additions & 12 deletions sonar-runner/gradle/idea.gradle

This file was deleted.

72 changes: 0 additions & 72 deletions sonar-runner/gradle/osSpecificDownloads.gradle

This file was deleted.

Binary file removed sonar-runner/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 0 additions & 6 deletions sonar-runner/gradle/wrapper/gradle-wrapper.properties

This file was deleted.

Loading

0 comments on commit df14375

Please sign in to comment.