Fix basic server test

edewata · edewata · commit 9a976736f569 · 2026-07-22T03:39:30.000-05:00
The basic server test has been updated to work with Fedora 45 and
and the new style of Tomcat 10.
diff --git a/.github/workflows/acme-basic-test.yml b/.github/workflows/acme-basic-test.yml
@@ -64,7 +64,8 @@ jobs:
               --network-alias=pki.example.com \
               pki
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec pki sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
 
diff --git a/.github/workflows/acme-container-basic-test.yml b/.github/workflows/acme-container-basic-test.yml
@@ -85,7 +85,8 @@ jobs:
               -o /dev/null \
               http://acme.example.com:8080/acme/directory
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec acme sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
           
diff --git a/.github/workflows/acme-existing-nssdb-test.yml b/.github/workflows/acme-existing-nssdb-test.yml
@@ -47,7 +47,8 @@ jobs:
               --network-alias=ca.example.com \
               ca
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec ca sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
           
diff --git a/.github/workflows/acme-separate-test.yml b/.github/workflows/acme-separate-test.yml
@@ -63,7 +63,8 @@ jobs:
               --network-alias=ca.example.com \
               ca
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec ca sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
           
diff --git a/.github/workflows/ca-basic-test.yml b/.github/workflows/ca-basic-test.yml
@@ -46,7 +46,8 @@ jobs:
               --network-alias=pki.example.com \
               pki
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec pki sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
 
diff --git a/.github/workflows/ca-clone-mldsa-test.yml b/.github/workflows/ca-clone-mldsa-test.yml
@@ -44,7 +44,8 @@ jobs:
               --network=example \
               client
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec client sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
 
diff --git a/.github/workflows/ca-container-basic-test.yml b/.github/workflows/ca-container-basic-test.yml
@@ -49,7 +49,8 @@ jobs:
               --network=example \
               client
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec client sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
 
diff --git a/.github/workflows/ca-container-existing-certs-test.yml b/.github/workflows/ca-container-existing-certs-test.yml
@@ -49,7 +49,8 @@ jobs:
               --network=example \
               client
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec client sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
 
diff --git a/.github/workflows/ca-container-existing-config-test.yml b/.github/workflows/ca-container-existing-config-test.yml
@@ -54,7 +54,8 @@ jobs:
               --network-alias=ca.example.com \
               pki
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec pki sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
 
diff --git a/.github/workflows/ca-container-migration-test.yml b/.github/workflows/ca-container-migration-test.yml
@@ -45,7 +45,8 @@ jobs:
               --network-alias=pki.example.com \
               pki
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec pki sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
 
diff --git a/.github/workflows/ca-container-system-service-test.yml b/.github/workflows/ca-container-system-service-test.yml
@@ -44,7 +44,8 @@ jobs:
               --network=example \
               pki
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec pki sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
 
diff --git a/.github/workflows/ca-container-user-service-test.yml b/.github/workflows/ca-container-user-service-test.yml
@@ -51,7 +51,8 @@ jobs:
               --network=example \
               pki
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec pki sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
 
diff --git a/.github/workflows/ca-existing-config-test.yml b/.github/workflows/ca-existing-config-test.yml
@@ -45,7 +45,8 @@ jobs:
               --network-alias=pki.example.com \
               pki
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec pki sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
           
diff --git a/.github/workflows/ca-mldsa-test.yml b/.github/workflows/ca-mldsa-test.yml
@@ -46,7 +46,8 @@ jobs:
               --network-alias=pki.example.com \
               pki
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec pki sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
 
diff --git a/.github/workflows/est-ds-realm-separate-test.yml b/.github/workflows/est-ds-realm-separate-test.yml
@@ -87,7 +87,8 @@ jobs:
           --network-alias=est.example.com \
           est
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec est sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
           
diff --git a/.github/workflows/est-ds-realm-test.yml b/.github/workflows/est-ds-realm-test.yml
@@ -46,7 +46,8 @@ jobs:
           --network-alias=pki.example.com \
           pki
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec pki sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
           
diff --git a/.github/workflows/est-postgresql-realm-test.yml b/.github/workflows/est-postgresql-realm-test.yml
@@ -46,7 +46,8 @@ jobs:
           --network-alias=pki.example.com \
           pki
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec pki sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
           
diff --git a/.github/workflows/est-standalone-test.yml b/.github/workflows/est-standalone-test.yml
@@ -88,7 +88,8 @@ jobs:
           --network-alias=est.example.com \
           est
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec est sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
           
diff --git a/.github/workflows/kra-basic-test.yml b/.github/workflows/kra-basic-test.yml
@@ -56,7 +56,8 @@ jobs:
               --network-alias=pki.example.com \
               pki
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec pki sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
           
diff --git a/.github/workflows/kra-container-test.yml b/.github/workflows/kra-container-test.yml
@@ -333,7 +333,8 @@ jobs:
               -o /dev/null \
               https://kra.example.com:8443
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec kra sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
           
diff --git a/.github/workflows/kra-existing-config-test.yml b/.github/workflows/kra-existing-config-test.yml
@@ -45,7 +45,8 @@ jobs:
               --network-alias=pki.example.com \
               pki
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec pki sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
           
diff --git a/.github/workflows/ocsp-basic-test.yml b/.github/workflows/ocsp-basic-test.yml
@@ -54,7 +54,8 @@ jobs:
               --network-alias=pki.example.com \
               pki
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec pki sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
           
diff --git a/.github/workflows/ocsp-container-test.yml b/.github/workflows/ocsp-container-test.yml
@@ -309,7 +309,8 @@ jobs:
               -o /dev/null \
               https://ocsp.example.com:8443
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec ocsp sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
           
diff --git a/.github/workflows/ocsp-existing-config-test.yml b/.github/workflows/ocsp-existing-config-test.yml
@@ -45,7 +45,8 @@ jobs:
               --network-alias=pki.example.com \
               pki
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec pki sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
           
diff --git a/.github/workflows/server-basic-test.yml b/.github/workflows/server-basic-test.yml
@@ -37,7 +37,8 @@ jobs:
               --network-alias=pki.example.com \
               pki
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec pki sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
           
@@ -110,8 +111,8 @@ jobs:
           lrwxrwxrwx root root httpclient.jar -> httpclient-x.y.z.jar
           -rw-r--r-- root root httpcore-x.y.z.jar
           lrwxrwxrwx root root httpcore.jar -> httpcore-x.y.z.jar
-          -rw-r--r-- root root jackson-annotations-x.y.z.jar
-          lrwxrwxrwx root root jackson-annotations.jar -> jackson-annotations-x.y.z.jar
+          -rw-r--r-- root root jackson-annotations-x.y.jar
+          lrwxrwxrwx root root jackson-annotations.jar -> jackson-annotations-x.y.jar
           -rw-r--r-- root root jackson-core-x.y.z.jar
           lrwxrwxrwx root root jackson-core.jar -> jackson-core-x.y.z.jar
           -rw-r--r-- root root jackson-databind-x.y.z.jar
@@ -150,9 +151,10 @@ jobs:
           EOF
 
           # normalize actual result:
-          # - replace version number with x.y.z
+          # - replace version number with x.y or x.y.z
           # - replace servlet.jar with tomcat-servlet-api.jar
-          sed -e 's/-[0-9]*\.[0-9]*\.[0-9]*\.jar$/-x.y.z.jar/' \
+          sed -e 's/-[0-9]*\.[0-9]*\.jar$/-x.y.jar/' \
+              -e 's/-[0-9]*\.[0-9]*\.[0-9]*\.jar$/-x.y.z.jar/' \
               -e 's/-[0-9]*\.[0-9]*\.[0-9]*\.Final\.jar$/-x.y.z.Final.jar/' \
               -e 's/\/servlet.jar$/\/tomcat-servlet-api.jar/' \
               output > actual
@@ -303,7 +305,7 @@ jobs:
           lrwxrwxrwx pkiuser pkiuser lib -> /usr/share/pki/server/lib
           lrwxrwxrwx pkiuser pkiuser logs -> /var/log/pki/pki-tomcat
           drwxr-x--- pkiuser pkiuser temp
-          drwxrwx--- pkiuser pkiuser webapps
+          drwxr-x--- pkiuser pkiuser webapps
           drwxr-x--- pkiuser pkiuser work
           EOF
 
@@ -712,8 +714,6 @@ jobs:
 
           cat > expected_new << EOF
           drwxr-x--- tomcat tomcat backup
-          -rw-r--r-- tomcat tomcat catalina.$DATE.log
-          -rw-r----- tomcat tomcat localhost_access_log.$DATE.txt
           EOF
 
           diff expected_$TOMCAT_FLAVOR output
@@ -852,8 +852,6 @@ jobs:
 
           cat > expected_new << EOF
           drwxr-x--- tomcat tomcat backup
-          -rw-r--r-- tomcat tomcat catalina.$DATE.log
-          -rw-r----- tomcat tomcat localhost_access_log.$DATE.txt
           EOF
 
           diff expected_$TOMCAT_FLAVOR output
diff --git a/.github/workflows/server-container-test.yml b/.github/workflows/server-container-test.yml
@@ -72,7 +72,8 @@ jobs:
               -o /dev/null \
               https://pki.example.com:8443
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec server sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
           
diff --git a/.github/workflows/tks-basic-test.yml b/.github/workflows/tks-basic-test.yml
@@ -46,7 +46,8 @@ jobs:
               --network-alias=pki.example.com \
               pki
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec pki sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
           
diff --git a/.github/workflows/tks-container-test.yml b/.github/workflows/tks-container-test.yml
@@ -298,7 +298,8 @@ jobs:
               -o /dev/null \
               https://tks.example.com:8443
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec tks sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
           
diff --git a/.github/workflows/tks-existing-config-test.yml b/.github/workflows/tks-existing-config-test.yml
@@ -45,7 +45,8 @@ jobs:
               --network-alias=pki.example.com \
               pki
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec pki sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
           
diff --git a/.github/workflows/tps-basic-test.yml b/.github/workflows/tps-basic-test.yml
@@ -46,7 +46,8 @@ jobs:
               --network-alias=pki.example.com \
               pki
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec pki sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
           
diff --git a/.github/workflows/tps-container-test.yml b/.github/workflows/tps-container-test.yml
@@ -664,7 +664,8 @@ jobs:
               -o /dev/null \
               https://tps.example.com:8443
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec tps sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
           
diff --git a/.github/workflows/tps-existing-config-test.yml b/.github/workflows/tps-existing-config-test.yml
@@ -45,7 +45,8 @@ jobs:
               --network-alias=pki.example.com \
               pki
 
-          # get Fedora version
+      - name: Get Fedora version
+        run: |
           FEDORA_VERSION=$(docker exec pki sed -n 's/^VERSION_ID=//p' /etc/os-release)
           echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
           
