Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

### Changed
* Push container images to AWS ECR independently of EKS, while optionally triggering EKS deployments when needed ([#1267](https://github.com/opendevstack/ods-jenkins-shared-library/pull/1267))
* Updated Java version in sonarqube execution to Java 21 ([#1269](https://github.com/opendevstack/ods-jenkins-shared-library/pull/1269))

### Fixed
* Fix Tailor deployment drifts for D, Q envs ([#1055](https://github.com/opendevstack/ods-jenkins-shared-library/pull/1055))
Expand Down
4 changes: 2 additions & 2 deletions src/org/ods/services/SonarQubeService.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ class SonarQubeService {
scannerParams << "-Dsonar.branch.name=${properties['sonar.branch.name']}"
}
script.sh(
label: 'Set Java 17 for SonarQube scan',
script: "source use-j17.sh"
label: 'Set Java 21 for SonarQube scan',
script: "source use-j21.sh"
)
script.sh(
label: 'Run SonarQube scan',
Expand Down
2 changes: 1 addition & 1 deletion test/groovy/org/ods/services/SonarQubeServiceSpec.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class SonarQubeServiceSpec extends PipelineSpockTestBase {
service.scan(optionsWithoutPrivateToken)

then:
2 * steps.sh(label: 'Set Java 17 for SonarQube scan', script: "source use-j17.sh")
2 * steps.sh(label: 'Set Java 21 for SonarQube scan', script: "source use-j21.sh")
1 * steps.sh(label: 'Run SonarQube scan', script: { it.contains("/opt/sonar-scanner/bin/sonar-scanner") && it.contains("-Dsonar.projectKey=key") && it.contains("-Dsonar.projectName=name") && it.contains("-Dsonar.exclusions=test/**") && it.contains("-Dsonar.auth.token=my-private-token") })
1 * steps.sh(label: 'Run SonarQube scan', script: { it.contains("/opt/sonar-scanner/bin/sonar-scanner") && it.contains("-Dsonar.projectKey=key") && it.contains("-Dsonar.projectName=name") && it.contains("-Dsonar.exclusions=test/**") && it.contains("-Dsonar.auth.token=public-token") })
}
Expand Down
Loading