diff options
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | docker/biboumi-test/fedora/Dockerfile | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d55d473..3c0da4b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -147,4 +147,6 @@ test:sonar-qube: script: - cmake .. - ~/sonar-scanner/bin/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir ./bw-outputs make biboumi test_suite - - ~/sonar-scanner/bin/sonar-scanner -Dsonar.host.url=https://sonarqube.com -Dsonar.login=$SONAR_LOGIN + - cd .. + - ~/sonar-scanner/bin/sonar-scanner -Dsonar.host.url=https://sonarqube.com -Dsonar.login=$SONAR_LOGIN -Dsonar.language=cpp -Dsonar.cfamily.build-wrapper-output=bw-outputs -Dsonar.sourceEncoding=UTF-8 -Dsonar.sources=src/,louloulibs/,tests/ -Dsonar.projectKey=biboumi -Dsonar.projectName=Biboumi -Dsonar.projectVersion=3.0 + diff --git a/docker/biboumi-test/fedora/Dockerfile b/docker/biboumi-test/fedora/Dockerfile index 0d0a9ea..ebcb4e4 100644 --- a/docker/biboumi-test/fedora/Dockerfile +++ b/docker/biboumi-test/fedora/Dockerfile @@ -62,6 +62,8 @@ RUN su - tester -c "echo export LANG=en_GB.utf-8 >> /home/tester/.bashrc" COPY coverity /home/tester/coverity COPY sonar-scanner-2.8 /home/tester/sonar-scanner +RUN dnf install -y which java-1.8.0-openjdk + WORKDIR /home/tester USER tester |