Skip to content

Commit c3d4db4

Browse files
committed
ci: use multistage container build to reduce image size
1 parent 88f3d56 commit c3d4db4

File tree

1 file changed

+1
-59
lines changed

1 file changed

+1
-59
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ rpm:
122122
image: dcache/maven-java17-rpm-build
123123
extends: .build_cache
124124
script:
125-
- mvn $MAVEN_CLI_OPTS -Drun.slow.tests -am -pl packages/fhs -P rpm clean package
125+
- mvn $MAVEN_CLI_OPTS -DskipTests -am -pl packages/fhs -P rpm clean package
126126
artifacts:
127127
reports:
128128
junit:
@@ -132,17 +132,6 @@ rpm:
132132
- "packages/fhs/target/rpmbuild/RPMS/noarch/dcache*.rpm"
133133
expire_in: 2 days
134134

135-
srm_client_rpm:
136-
stage: build
137-
image: dcache/maven-java17-rpm-build
138-
extends: .build_cache
139-
script:
140-
- mvn $MAVEN_CLI_OPTS -DskipTests -am -pl modules/srm-client package -P rpm
141-
artifacts:
142-
paths:
143-
- "modules/srm-client/target/rpmbuild/RPMS/noarch/dcache-srmclient*.rpm"
144-
expire_in: 2 days
145-
146135
deb:
147136
stage: build
148137
image: dcache/maven-java17-deb-build
@@ -165,25 +154,6 @@ tar:
165154
- "packages/tar/target/dcache-*.tar.gz"
166155
expire_in: 2 days
167156

168-
169-
spotbugs:
170-
stage: build
171-
image: dcache/maven-java17-tar-build
172-
extends: .build_cache
173-
rules:
174-
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
175-
script:
176-
- dnf -y -q install jq
177-
- mvn $MAVEN_CLI_OPTS -DskipTests -am -pl packages/tar -DskipTests package com.github.spotbugs:spotbugs-maven-plugin:4.8.3.0:spotbugs verify
178-
- find . -name gl-code-quality-report.json -print | xargs cat | jq -s "add" > merged-gl-code-quality-report.json
179-
artifacts:
180-
reports:
181-
codequality:
182-
- merged-gl-code-quality-report.json
183-
paths:
184-
- merged-gl-code-quality-report.json
185-
expire_in: 2 days
186-
187157
container:
188158
stage: build
189159
# For latest releases see https://github.com/GoogleContainerTools/kaniko/releases
@@ -244,22 +214,6 @@ sign_rpm:
244214
paths:
245215
- packages/fhs/target/rpmbuild/RPMS/noarch/dcache*.rpm
246216

247-
sign_srm_client_rpm:
248-
stage: sign
249-
image: almalinux:9-minimal
250-
needs: ["srm_client_rpm"]
251-
script:
252-
- microdnf install -y rpm-sign
253-
- echo $DCACHE_ORG_PGP_KEY | base64 -d -i > secret.gpg
254-
- gpg --quiet --batch --yes --allow-secret-key-import --passphrase="$DCACHE_ORG_PGP_KEY_PASS" --import secret.gpg
255-
- gpg -a --export "$DCACHE_ORG_KEY_NAME" > RPM-GPG-KEY
256-
- rpmsign --addsign --define "_signature gpg" --define "_gpg_name $DCACHE_ORG_KEY_NAME" --define "_gpg_sign_cmd_extra_args --pinentry-mode loopback --passphrase $DCACHE_ORG_PGP_KEY_PASS" modules/srm-client/target/rpmbuild/RPMS/noarch/dcache-srmclient*.rpm
257-
- rpmkeys --import RPM-GPG-KEY
258-
- rpm --checksig -v modules/srm-client/target/rpmbuild/RPMS/noarch/dcache-srmclient*.rpm
259-
artifacts:
260-
paths:
261-
- modules/srm-client/target/rpmbuild/RPMS/noarch/dcache-srmclient*.rpm
262-
263217
sign_deb:
264218
stage: sign
265219
image: ubuntu:22.04
@@ -304,16 +258,6 @@ upload_rpm:
304258
- VERSION=`echo $RPM_NAME | cut -d'-' -f 2 | cut -d'.' -f 1,2`
305259
- curl $PKG_UPLOAD_OPTIONS -u $PKG_UPLOAD_USER:$PKG_UPLOAD_PASS --upload-file packages/fhs/target/rpmbuild/RPMS/noarch/$RPM_NAME "$PKG_UPLOAD_URL/$VERSION/$RPM_NAME"
306260

307-
upload_srm_client_rpm:
308-
stage: upload
309-
image: almalinux:9-minimal
310-
dependencies:
311-
- sign_srm_client_rpm
312-
extends: .upload_rules
313-
script:
314-
- RPM_NAME=`ls modules/srm-client/target/rpmbuild/RPMS/noarch/ | grep dcache-srmclient`
315-
- VERSION=`echo $RPM_NAME | cut -d'-' -f 3 | cut -d'.' -f 1,2`
316-
- curl $PKG_UPLOAD_OPTIONS -u $PKG_UPLOAD_USER:$PKG_UPLOAD_PASS --upload-file modules/srm-client/target/rpmbuild/RPMS/noarch/$RPM_NAME "$PKG_UPLOAD_URL/$VERSION/$RPM_NAME"
317261

318262
upload_deb:
319263
stage: upload
@@ -377,7 +321,6 @@ AI Generated Release Notes:
377321
dependencies:
378322
- sign_deb
379323
- sign_rpm
380-
- sign_srm_client_rpm
381324
- tar
382325
script:
383326
- microdnf install -y git-core
@@ -410,7 +353,6 @@ Release Notes Table:
410353
dependencies:
411354
- sign_deb
412355
- sign_rpm
413-
- sign_srm_client_rpm
414356
- tar
415357
script:
416358
- microdnf install -y git-core

0 commit comments

Comments
 (0)