Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

REL-2987 Upgrade SonarQube to 10.4.0.87240 #666

Merged
merged 2 commits into from
Feb 2, 2024
Merged
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
4 changes: 2 additions & 2 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ env:
STAGING_IMAGE_NAME: sonarsource/sonarqube
PUBLIC_IMAGE_NAME: sonarqube
CURRENT_LTS_VERSION: 9.9.3
CURRENT_VERSION: 10.3.0
NEXT_VERSION: 10.4.0
CURRENT_VERSION: 10.4.0
NEXT_VERSION: 10.5.0


vm_instance_template: &VM_TEMPLATE
Expand Down
2 changes: 1 addition & 1 deletion 10/community/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ENV LANG='en_US.UTF-8' \
#
# SonarQube setup
#
ARG SONARQUBE_VERSION=10.3.0.82913
ARG SONARQUBE_VERSION=10.4.0.87240
ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/Distribution/sonarqube/sonarqube-${SONARQUBE_VERSION}.zip
ENV DOCKER_RUNNING="true" \
JAVA_HOME='/opt/java/openjdk' \
Expand Down
2 changes: 1 addition & 1 deletion 10/datacenter/app/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ENV LANG='en_US.UTF-8' \
#
# SonarQube setup
#
ARG SONARQUBE_VERSION=10.3.0.82913
ARG SONARQUBE_VERSION=10.4.0.87240
ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-datacenter/sonarqube-datacenter-${SONARQUBE_VERSION}.zip
ENV DOCKER_RUNNING="true" \
JAVA_HOME='/opt/java/openjdk' \
Expand Down
2 changes: 1 addition & 1 deletion 10/datacenter/search/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ENV LANG='en_US.UTF-8' \
#
# SonarQube setup
#
ARG SONARQUBE_VERSION=10.3.0.82913
ARG SONARQUBE_VERSION=10.4.0.87240
ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-datacenter/sonarqube-datacenter-${SONARQUBE_VERSION}.zip
ENV DOCKER_RUNNING="true" \
JAVA_HOME='/opt/java/openjdk' \
Expand Down
2 changes: 1 addition & 1 deletion 10/developer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ENV LANG='en_US.UTF-8' \
#
# SonarQube setup
#
ARG SONARQUBE_VERSION=10.3.0.82913
ARG SONARQUBE_VERSION=10.4.0.87240
ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-developer/sonarqube-developer-${SONARQUBE_VERSION}.zip
ENV DOCKER_RUNNING="true" \
JAVA_HOME='/opt/java/openjdk' \
Expand Down
2 changes: 1 addition & 1 deletion 10/enterprise/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ENV LANG='en_US.UTF-8' \
#
# SonarQube setup
#
ARG SONARQUBE_VERSION=10.3.0.82913
ARG SONARQUBE_VERSION=10.4.0.87240
ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-enterprise/sonarqube-enterprise-${SONARQUBE_VERSION}.zip
ENV DOCKER_RUNNING="true" \
JAVA_HOME='/opt/java/openjdk' \
Expand Down
4 changes: 2 additions & 2 deletions run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ require() {
wait_for_sonarqube() {
local image=$1 i web_up=no sonarqube_up=no

for ((i = 0; i < 10; i++)); do
for ((i = 0; i < 15; i++)); do
info "$image: waiting for web server to start ..."
if curl -sI localhost:$port | grep '^HTTP/.* 200'; then
web_up=yes
Expand All @@ -53,7 +53,7 @@ wait_for_sonarqube() {

[[ $web_up = yes ]] || return 1

for ((i = 0; i < 20; i++)); do
for ((i = 0; i < 30; i++)); do
info "$image: waiting for sonarqube to be ready ..."
if curl -s localhost:$port/api/system/status | grep '"status":"UP"'; then
sonarqube_up=yes
Expand Down
Loading