diff options
| author | Zipeng WU <zipeng.wu@sonarsource.com> | 2022-03-24 14:18:50 +0100 |
|---|---|---|
| committer | zipeng-wu-sonarsource <68143726+zipeng-wu-sonarsource@users.noreply.github.com> | 2022-03-28 16:13:27 +0200 |
| commit | 477e167f6b75a93d76931645b7b181dc829ce1a5 (patch) | |
| tree | 779c090c88affcd346106c862c7f3451feb05051 | |
| parent | 8c73aabed5dee00d5e184750984099b63aaf676a (diff) | |
| download | sonar-scanner-cli-477e167f6b75a93d76931645b7b181dc829ce1a5.tar.gz sonar-scanner-cli-477e167f6b75a93d76931645b7b181dc829ce1a5.zip | |
SONAR-16183 Add java 17 in CI to sonar-scanner-maven
| -rw-r--r-- | .cirrus.yml | 28 | ||||
| -rw-r--r-- | it/docker/Dockerfile_17 | 21 |
2 files changed, 49 insertions, 0 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index fe1b925..fed0cea 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -78,6 +78,34 @@ linux_qa_task: env: matrix: - SQ_VERSION: LATEST_RELEASE[7.9] + - SQ_VERSION: LATEST_RELEASE[8.9] + - SQ_VERSION: DEV + maven_cache: + folder: ${CIRRUS_WORKING_DIR}/.m2/repository + qa_script: + - source cirrus-env QA + - source set_maven_build_version $BUILD_NUMBER + - cd it + - mvn -B -e -Dsonar.runtimeVersion="$SQ_VERSION" -Dmaven.test.redirectTestOutputToFile=false verify + cleanup_before_cache_script: + - cleanup_maven_repository + +linux_qa_java17_task: + depends_on: + - build + <<: *ONLY_SONARSOURCE_QA + gke_container: + dockerfile: it/docker/Dockerfile_17 + builder_image_project: sonarqube-team + builder_image_name: docker-builder-v20200915 + cluster_name: cirrus-ci-cluster + zone: us-central1-a + namespace: default + cpu: 1 + memory: 2G + env: + matrix: + - SQ_VERSION: LATEST_RELEASE[8.9] - SQ_VERSION: DEV maven_cache: folder: ${CIRRUS_WORKING_DIR}/.m2/repository diff --git a/it/docker/Dockerfile_17 b/it/docker/Dockerfile_17 new file mode 100644 index 0000000..7f17f1e --- /dev/null +++ b/it/docker/Dockerfile_17 @@ -0,0 +1,21 @@ +#------------------------------------------------------------------------------ +# Installs NodeJS, which is needed for running the Linux ITs. +# +# Build from the basedir: +# docker build -f it/docker/Dockerfile-qa -t sonar-scanner-cli-qa it/docker +# +# Verify the content of the image by running a shell session in it: +# docker run -it sonar-scanner-cli-qa bash +# +# CirrusCI builds the image when needed. No need to manually upload it to +# Google Cloud Container Registry. See section "gke_container" of .cirrus.yml +#------------------------------------------------------------------------------ + +FROM us.gcr.io/sonarqube-team/base:j17-m3-latest + +USER root + +RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - +RUN apt-get install -y nodejs + +USER sonarsource |