Skip to content

Commit b36b9af

Browse files
authored
QE-2641: Update Coverity client and licence (#298)
1 parent d97c471 commit b36b9af

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

jenkins/build-image.sh

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#!/usr/bin/env bash
2-
DOCKER_REGISTRY=mobile-studio--docker.eu-west-1.artifactory.aws.arm.com
2+
ARTIFACTORY_URL=eu-west-1.artifactory.aws.arm.com
3+
DOCKER_REGISTRY=mobile-studio--docker.${ARTIFACTORY_URL}
34
IMAGE_NAME=astcenc
4-
IMAGE_VERSION=3.0.0
5+
IMAGE_VERSION=3.1.0
56

67
# Check Artifactory credentials are set
78
if [[ -z "${ARTIFACTORY_CREDENTIALS}" ]]
@@ -17,11 +18,8 @@ rm -fr tmp
1718
mkdir -p tmp
1819

1920
echo "Get static analysis tools"
20-
curl --user ${ARTIFACTORY_CREDENTIALS} https://eu-west-1.artifactory.aws.arm.com/artifactory/mobile-studio.tools/coverity201909.tar.xz --output tmp/coverity.tar.xz
21-
pushd tmp
22-
tar xf coverity.tar.xz
23-
rm coverity.tar.xz
24-
popd
21+
curl --user ${ARTIFACTORY_CREDENTIALS} https://${ARTIFACTORY_URL}/artifactory/mobile-studio.tools/coverity/cov-analysis-linux64-2020.12.sh --output tmp/coverity_install.sh
22+
curl --user ${ARTIFACTORY_CREDENTIALS} https://${ARTIFACTORY_URL}/artifactory/mobile-studio.tools/coverity/license.dat --output tmp/coverity_license.dat
2523

2624
echo "Building image"
2725
docker build -f jenkins/build.Dockerfile \

jenkins/build.Dockerfile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ FROM ubuntu:18.04
22

33
RUN useradd -u 1000 -U -m -c Jenkins jenkins
44

5-
RUN apt update && apt-get install -y \
5+
RUN apt update && apt -y upgrade \
6+
&& apt install -y \
67
software-properties-common \
78
clang \
89
clang++-9 \
@@ -18,15 +19,18 @@ RUN apt update && apt-get install -y \
1819
python3-pil \
1920
ca-certificates \
2021
gnupg \
21-
wget
22+
wget \
23+
&& rm -rf /var/lib/apt/lists/*
2224

2325
# Install python modules
2426
RUN pip3 install requests
2527

2628
# Install Coverity static analysis tools
27-
COPY cov-analysis-linux64-2019.09 /coverity/
28-
RUN chmod -R a+rw /coverity
29-
ENV PATH="/coverity/bin:$PATH"
29+
COPY coverity_* /tmp/
30+
RUN chmod 555 /tmp/coverity_install.sh && \
31+
/tmp/coverity_install.sh -q --license.region=6 --license.agreement=agree --license.cov.path=/tmp/coverity_license.dat -dir /usr/local/cov-analysis && \
32+
rm /tmp/coverity_*
33+
ENV PATH="/usr/local/cov-analysis/bin:$PATH"
3034

3135
# Install up-to-date CMake, as standard Ubuntu 18.04 package is too old
3236
RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null \

jenkins/nightly.Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pipeline {
4141
- name: artifactory-ms-docker
4242
containers:
4343
- name: astcenc
44-
image: mobile-studio--docker.eu-west-1.artifactory.aws.arm.com/astcenc:3.0.0
44+
image: mobile-studio--docker.eu-west-1.artifactory.aws.arm.com/astcenc:3.1.0
4545
command:
4646
- sleep
4747
args:

jenkins/release.Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ spec:
4343
- name: artifactory-ms-docker
4444
containers:
4545
- name: astcenc
46-
image: mobile-studio--docker.eu-west-1.artifactory.aws.arm.com/astcenc:3.0.0
46+
image: mobile-studio--docker.eu-west-1.artifactory.aws.arm.com/astcenc:3.1.0
4747
command:
4848
- sleep
4949
args:

0 commit comments

Comments
 (0)