Skip to content

Commit 37ea52d

Browse files
edewataedewata
committed
Fix Azure pipeline
The Azure pipeline has been updated to use the proper COPR repository and JSS version, and also migrate the JAR files to Tomcat 10. The PKI_TOMCAT_9_0_JAR and PKI_TOMCAT_10_1_JAR properties in CMake has been renamed into PKI_TOMCAT_IMPL_JAR to make it easier to support multiple Tomcat versions.
1 parent 4934d92 commit 37ea52d

8 files changed

Lines changed: 57 additions & 16 deletions

File tree

‎azure-pipelines.yml‎

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,13 @@ jobs:
1818
print('##vso[task.setvariable variable=BASE_IMAGE]{value}'.format(value=value))
1919
2020
value = os.getenv('REGISTRY_NAMESPACE', 'dogtagpki')
21-
print('NAMESPACE: {value}'.format(value=value))
21+
print('REGISTRY_NAMESPACE: {value}'.format(value=value))
2222
print('##vso[task.setvariable variable=NAMESPACE]{value}'.format(value=value))
2323
24+
value = os.getenv('COPR_REPO', '@pki/11.8')
25+
print('COPR_REPO: {value}'.format(value=value))
26+
print('##vso[task.setvariable variable=COPR_REPO]{value}'.format(value=value))
27+
2428
- script: |
2529
# replace registry namespace
2630
sed -i "s/quay.io\/dogtagpki\//quay.io\/$NAMESPACE\//g" Dockerfile
@@ -29,16 +33,17 @@ jobs:
2933
- script: |
3034
docker build \
3135
--build-arg BASE_IMAGE=$BASE_IMAGE \
36+
--build-arg COPR_REPO=$COPR_REPO \
3237
--target pki-base \
33-
--tag pki-base:latest \
38+
--tag pki-base:11.8 \
3439
.
3540
3641
docker run \
3742
--name=runner \
3843
-v $BUILD_SOURCESDIRECTORY:/root/src \
3944
--privileged \
4045
--detach \
41-
pki-base:latest
46+
pki-base:11.8
4247
4348
while :
4449
do
@@ -54,7 +59,7 @@ jobs:
5459
docker exec runner dnf install -y dnf-plugins-core rpm-build
5560
if [ -n "$COPR_REPO" ]; then docker exec runner dnf copr enable -y $COPR_REPO; fi
5661
57-
docker create --name=jss-dist quay.io/$NAMESPACE/jss-dist:latest
62+
docker create --name=jss-dist quay.io/$NAMESPACE/jss-dist:5.8
5863
docker cp jss-dist:/root/RPMS/. /tmp/RPMS
5964
docker rm -f jss-dist
6065
@@ -124,6 +129,43 @@ jobs:
124129
file_list
125130
displayName: Get list of files from RPM packages
126131
132+
- script: |
133+
docker exec runner javax2jakarta -profile=EE \
134+
/usr/share/java/jakarta-annotations/jakarta.annotation-api.jar \
135+
/usr/share/java/jakarta-annotations/jakarta.annotation-api.jar
136+
137+
docker exec runner javax2jakarta -profile=EE \
138+
/usr/share/java/jboss-jaxrs-2.0-api.jar \
139+
/usr/share/java/jboss-jaxrs-2.0-api.jar
140+
141+
docker exec runner javax2jakarta -profile=EE \
142+
/usr/share/java/jackson-annotations.jar \
143+
/usr/share/java/jackson-annotations.jar
144+
docker exec runner javax2jakarta -profile=EE \
145+
/usr/share/java/jackson-core.jar \
146+
/usr/share/java/jackson-core.jar
147+
docker exec runner javax2jakarta -profile=EE \
148+
/usr/share/java/jackson-databind.jar \
149+
/usr/share/java/jackson-databind.jar
150+
docker exec runner javax2jakarta -profile=EE \
151+
/usr/share/java/jackson-modules/jackson-module-jaxb-annotations.jar \
152+
/usr/share/java/jackson-modules/jackson-module-jaxb-annotations.jar
153+
154+
docker exec runner javax2jakarta -profile=EE \
155+
/usr/share/java/resteasy/resteasy-servlet-initializer.jar \
156+
/usr/share/java/resteasy/resteasy-servlet-initializer.jar
157+
docker exec runner javax2jakarta -profile=EE \
158+
/usr/share/java/resteasy/resteasy-jaxrs.jar \
159+
/usr/share/java/resteasy/resteasy-jaxrs.jar
160+
docker exec runner javax2jakarta -profile=EE \
161+
/usr/share/java/resteasy/resteasy-jackson2-provider.jar \
162+
/usr/share/java/resteasy/resteasy-jackson2-provider.jar
163+
docker exec runner javax2jakarta -profile=EE \
164+
/usr/share/java/resteasy/resteasy-client.jar \
165+
/usr/share/java/resteasy/resteasy-client.jar
166+
167+
displayName: Migrate JAR files
168+
127169
- script: |
128170
# get Python <major>.<minor> version
129171
docker exec runner python3 --version | tee output

‎base/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ if(WITH_SERVER OR WITH_CA OR WITH_KRA OR WITH_OCSP OR WITH_TKS OR WITH_TPS OR WI
595595

596596
list(APPEND PKI_JAVADOC_CLASSPATH
597597
${PKI_TOMCAT_JAR}
598-
${PKI_TOMCAT_9_0_JAR}
598+
${PKI_TOMCAT_IMPL_JAR}
599599
${PKI_SERVER_JAR})
600600

601601
if(WITH_CA)

‎base/acme/CMakeLists.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ javac(pki-acme-classes
1717
${LDAPJDK_JAR}
1818
${PKI_COMMON_JAR}
1919
${PKI_TOMCAT_JAR}
20-
<!-- ${PKI_TOMCAT_9_0_JAR} -->
21-
${PKI_TOMCAT_10_1_JAR}
20+
${PKI_TOMCAT_IMPL_JAR}
2221
${PKI_SERVER_JAR}
2322
OUTPUT_DIR
2423
${CMAKE_CURRENT_BINARY_DIR}/classes

‎base/ca/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ javac(pki-ca-classes
2828
${RESTEASY_JAXRS_JAR}
2929
${PKI_COMMON_JAR}
3030
${PKI_TOMCAT_JAR}
31-
${PKI_TOMCAT_9_0_JAR}
31+
${PKI_TOMCAT_IMPL_JAR}
3232
${PKI_SERVER_JAR}
3333
OUTPUT_DIR
3434
${CMAKE_CURRENT_BINARY_DIR}/classes

‎base/est/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ javac(pki-est-classes
1919
${PKI_CMSUTIL_JAR}
2020
${PKI_COMMON_JAR}
2121
${PKI_TOMCAT_JAR}
22-
${PKI_TOMCAT_9_0_JAR}
22+
${PKI_TOMCAT_IMPL_JAR}
2323
${PKI_SERVER_JAR}
2424
OUTPUT_DIR
2525
${CMAKE_CURRENT_BINARY_DIR}/classes

‎base/server/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ javac(pki-server-classes
2525
${RESTEASY_JAXRS_JAR}
2626
${PKI_COMMON_JAR}
2727
${PKI_TOMCAT_JAR}
28-
${PKI_TOMCAT_9_0_JAR}
28+
${PKI_TOMCAT_IMPL_JAR}
2929
OUTPUT_DIR
3030
${CMAKE_CURRENT_BINARY_DIR}/classes
3131
DEPENDS

‎base/tomcat-10.1/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ javac(pki-tomcat-10.1-classes
2323

2424
add_dependencies(java pki-tomcat-10.1-classes)
2525

26-
set(PKI_TOMCAT_9_0_JAR ${CMAKE_BINARY_DIR}/dist/pki-tomcat-10.1.jar
26+
set(PKI_TOMCAT_IMPL_JAR ${CMAKE_BINARY_DIR}/dist/pki-tomcat-10.1.jar
2727
CACHE INTERNAL "pki-tomcat-10.1.jar"
2828
)
2929

@@ -34,7 +34,7 @@ configure_file(
3434

3535
jar(pki-tomcat-10.1-jar
3636
CREATE
37-
${PKI_TOMCAT_10_1_JAR}
37+
${PKI_TOMCAT_IMPL_JAR}
3838
OPTIONS
3939
m
4040
PARAMS
@@ -50,7 +50,7 @@ add_dependencies(java pki-tomcat-10.1-jar)
5050
if(WITH_JAVA)
5151
install(
5252
FILES
53-
${PKI_TOMCAT_10_1_JAR}
53+
${PKI_TOMCAT_IMPL_JAR}
5454
DESTINATION
5555
${JAVA_JAR_INSTALL_DIR}/pki
5656
)

‎base/tomcat-9.0/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ javac(pki-tomcat-9.0-classes
2323

2424
add_dependencies(java pki-tomcat-9.0-classes)
2525

26-
set(PKI_TOMCAT_9_0_JAR ${CMAKE_BINARY_DIR}/dist/pki-tomcat-9.0.jar
26+
set(PKI_TOMCAT_IMPL_JAR ${CMAKE_BINARY_DIR}/dist/pki-tomcat-9.0.jar
2727
CACHE INTERNAL "pki-tomcat-9.0.jar"
2828
)
2929

@@ -34,7 +34,7 @@ configure_file(
3434

3535
jar(pki-tomcat-9.0-jar
3636
CREATE
37-
${PKI_TOMCAT_9_0_JAR}
37+
${PKI_TOMCAT_IMPL_JAR}
3838
OPTIONS
3939
m
4040
PARAMS
@@ -50,7 +50,7 @@ add_dependencies(java pki-tomcat-9.0-jar)
5050
if(WITH_JAVA)
5151
install(
5252
FILES
53-
${PKI_TOMCAT_9_0_JAR}
53+
${PKI_TOMCAT_IMPL_JAR}
5454
DESTINATION
5555
${JAVA_JAR_INSTALL_DIR}/pki
5656
)

0 commit comments

Comments
 (0)