Skip to content

Commit 3389d9a

Browse files
edewataedewata
committed
Fix container tests
1 parent 2e509e3 commit 3389d9a

17 files changed

Lines changed: 432 additions & 430 deletions

‎.github/workflows/acme-existing-nssdb-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ jobs:
189189
lrwxrwxrwx pkiuser pkiuser lib -> /usr/share/pki/server/lib
190190
lrwxrwxrwx pkiuser pkiuser logs -> /var/log/pki/pki-tomcat
191191
drwxr-x--- pkiuser pkiuser temp
192-
drwxrwx--- pkiuser pkiuser webapps
192+
drwxr-x--- pkiuser pkiuser webapps
193193
drwxr-x--- pkiuser pkiuser work
194194
EOF
195195

‎.github/workflows/ca-container-basic-test.yml‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -102,29 +102,29 @@ jobs:
102102
# everything should be owned by runner group
103103
# TODO: review owners/permissions
104104
cat > expected << EOF
105-
drwxrwxrwx runner Catalina
106-
drwxrwxrwx runner alias
107-
drwxrwxrwx runner ca
108-
-rw-rw-rw- runner catalina.policy
105+
drwxrwx--- runner Catalina
106+
drwxrwx--- runner alias
107+
drwxrwx--- runner ca
108+
-rw-rw---- runner catalina.policy
109109
lrwxrwxrwx runner catalina.properties -> /usr/share/pki/server/conf/catalina.properties
110-
drwxrwxrwx runner certs
110+
drwxrwx--- runner certs
111111
lrwxrwxrwx runner context.xml -> /etc/tomcat/context.xml
112-
-rw-rw-rw- runner jss.conf
112+
-rw-rw---- runner jss.conf
113113
lrwxrwxrwx runner logging.properties -> /usr/share/pki/server/conf/logging.properties
114-
-rw-rw-rw- runner password.conf
115-
-rw-rw-rw- runner server.xml
116-
-rw-rw-rw- runner serverCertNick.conf
117-
-rw-rw-rw- runner tomcat.conf
114+
-rw-rw---- runner password.conf
115+
-rw-rw---- runner server.xml
116+
-rw-rw---- runner serverCertNick.conf
117+
-rw-rw---- runner tomcat.conf
118118
lrwxrwxrwx runner web.xml -> /etc/tomcat/web.xml
119119
EOF
120120
121121
cat > expected_new_tomcat10 << EOF
122-
drwxrwxrwx runner Catalina
123-
drwxrwxrwx runner alias
124-
drwxrwxrwx runner ca
122+
drwxrwx--- runner Catalina
123+
drwxrwx--- runner alias
124+
drwxrwx--- runner ca
125125
-rw-rw---- runner catalina.policy
126126
lrwxrwxrwx runner catalina.properties -> /usr/share/pki/server/conf/catalina.properties
127-
drwxrwxrwx runner certs
127+
drwxrwx--- runner certs
128128
lrwxrwxrwx runner context.xml -> /etc/tomcat/context.xml
129129
-rw-rw---- runner jss.conf
130130
lrwxrwxrwx runner logging.properties -> /usr/share/pki/server/conf/logging.properties
@@ -157,18 +157,18 @@ jobs:
157157
# TODO: review owners/permissions
158158
cat > expected << EOF
159159
-rw-rw---- runner CS.cfg
160-
-rw-rw-rw- runner adminCert.profile
160+
-rw-rw---- runner adminCert.profile
161161
drwxrwxrwx runner archives
162-
-rw-rw-rw- runner caAuditSigningCert.profile
163-
-rw-rw-rw- runner caCert.profile
164-
-rw-rw-rw- runner caOCSPCert.profile
165-
drwxrwxrwx runner emails
166-
-rw-rw-rw- runner flatfile.txt
167-
drwxrwxrwx runner profiles
168-
-rw-rw-rw- runner proxy.conf
162+
-rw-rw---- runner caAuditSigningCert.profile
163+
-rw-rw---- runner caCert.profile
164+
-rw-rw---- runner caOCSPCert.profile
165+
drwxrwx--- runner emails
166+
-rw-rw---- runner flatfile.txt
167+
drwxrwx--- runner profiles
168+
-rw-rw---- runner proxy.conf
169169
-rw-rw---- runner registry.cfg
170-
-rw-rw-rw- runner serverCert.profile
171-
-rw-rw-rw- runner subsystemCert.profile
170+
-rw-rw---- runner serverCert.profile
171+
-rw-rw---- runner subsystemCert.profile
172172
EOF
173173
174174
cat > expected_new_tomcat10 << EOF
@@ -178,9 +178,9 @@ jobs:
178178
-rw-rw---- runner caAuditSigningCert.profile
179179
-rw-rw---- runner caCert.profile
180180
-rw-rw---- runner caOCSPCert.profile
181-
drwxrwxrwx runner emails
181+
drwxrwx--- runner emails
182182
-rw-rw---- runner flatfile.txt
183-
drwxrwxrwx runner profiles
183+
drwxrwx--- runner profiles
184184
-rw-rw---- runner proxy.conf
185185
-rw-rw---- runner registry.cfg
186186
-rw-rw---- runner serverCert.profile
@@ -209,11 +209,11 @@ jobs:
209209
# everything should be owned by runner group
210210
# TODO: review owners/permissions
211211
cat > expected << EOF
212-
drwxrwxrwx runner backup
213-
drwxrwxrwx runner ca
214-
-rw-rw-rw- runner localhost.$DATE.log
212+
drwxrwx--- runner backup
213+
drwxrwx--- runner ca
214+
-rw-rw---- runner localhost.$DATE.log
215215
-rw-rw-rw- runner localhost_access_log.$DATE.txt
216-
drwxrwxrwx runner pki
216+
drwxrwx--- runner pki
217217
EOF
218218
219219
diff expected output
@@ -232,14 +232,14 @@ jobs:
232232
# everything should be owned by runner group
233233
# TODO: review owners/permissions
234234
cat > expected << EOF
235-
drwxrwxrwx runner backup
236-
drwxrwxrwx runner ca
235+
drwxrwx--- runner backup
236+
drwxrwx--- runner ca
237237
-rw-rw-rw- runner localhost_access_log.$DATE.txt
238238
EOF
239239
240240
cat > expected_new_tomcat10 << EOF
241-
drwxrwxrwx runner backup
242-
drwxrwxrwx runner ca
241+
drwxrwx--- runner backup
242+
drwxrwx--- runner ca
243243
-rw-rw-rw- runner localhost_access_log.$DATE.txt
244244
EOF
245245

‎.github/workflows/ca-container-existing-certs-test.yml‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -208,29 +208,29 @@ jobs:
208208
# everything should be owned by runner group
209209
# TODO: review owners/permissions
210210
cat > expected << EOF
211-
drwxrwxrwx runner Catalina
212-
drwxrwxrwx runner alias
213-
drwxrwxrwx runner ca
214-
-rw-rw-rw- runner catalina.policy
211+
drwxrwx--- runner Catalina
212+
drwxrwx--- runner alias
213+
drwxrwx--- runner ca
214+
-rw-rw---- runner catalina.policy
215215
lrwxrwxrwx runner catalina.properties -> /usr/share/pki/server/conf/catalina.properties
216-
drwxrwxrwx runner certs
216+
drwxrwx--- runner certs
217217
lrwxrwxrwx runner context.xml -> /etc/tomcat/context.xml
218-
-rw-rw-rw- runner jss.conf
218+
-rw-rw---- runner jss.conf
219219
lrwxrwxrwx runner logging.properties -> /usr/share/pki/server/conf/logging.properties
220-
-rw-rw-rw- runner password.conf
221-
-rw-rw-rw- runner server.xml
222-
-rw-rw-rw- runner serverCertNick.conf
223-
-rw-rw-rw- runner tomcat.conf
220+
-rw-rw---- runner password.conf
221+
-rw-rw---- runner server.xml
222+
-rw-rw---- runner serverCertNick.conf
223+
-rw-rw---- runner tomcat.conf
224224
lrwxrwxrwx runner web.xml -> /etc/tomcat/web.xml
225225
EOF
226226
227227
cat > expected_new_tomcat10 << EOF
228-
drwxrwxrwx runner Catalina
229-
drwxrwxrwx runner alias
230-
drwxrwxrwx runner ca
228+
drwxrwx--- runner Catalina
229+
drwxrwx--- runner alias
230+
drwxrwx--- runner ca
231231
-rw-rw---- runner catalina.policy
232232
lrwxrwxrwx runner catalina.properties -> /usr/share/pki/server/conf/catalina.properties
233-
drwxrwxrwx runner certs
233+
drwxrwx--- runner certs
234234
lrwxrwxrwx runner context.xml -> /etc/tomcat/context.xml
235235
-rw-rw---- runner jss.conf
236236
lrwxrwxrwx runner logging.properties -> /usr/share/pki/server/conf/logging.properties
@@ -263,18 +263,18 @@ jobs:
263263
# TODO: review owners/permissions
264264
cat > expected << EOF
265265
-rw-rw---- runner CS.cfg
266-
-rw-rw-rw- runner adminCert.profile
266+
-rw-rw---- runner adminCert.profile
267267
drwxrwxrwx runner archives
268-
-rw-rw-rw- runner caAuditSigningCert.profile
269-
-rw-rw-rw- runner caCert.profile
270-
-rw-rw-rw- runner caOCSPCert.profile
271-
drwxrwxrwx runner emails
272-
-rw-rw-rw- runner flatfile.txt
273-
drwxrwxrwx runner profiles
274-
-rw-rw-rw- runner proxy.conf
268+
-rw-rw---- runner caAuditSigningCert.profile
269+
-rw-rw---- runner caCert.profile
270+
-rw-rw---- runner caOCSPCert.profile
271+
drwxrwx--- runner emails
272+
-rw-rw---- runner flatfile.txt
273+
drwxrwx--- runner profiles
274+
-rw-rw---- runner proxy.conf
275275
-rw-rw---- runner registry.cfg
276-
-rw-rw-rw- runner serverCert.profile
277-
-rw-rw-rw- runner subsystemCert.profile
276+
-rw-rw---- runner serverCert.profile
277+
-rw-rw---- runner subsystemCert.profile
278278
EOF
279279
280280
cat > expected_new_tomcat10 << EOF
@@ -284,9 +284,9 @@ jobs:
284284
-rw-rw---- runner caAuditSigningCert.profile
285285
-rw-rw---- runner caCert.profile
286286
-rw-rw---- runner caOCSPCert.profile
287-
drwxrwxrwx runner emails
287+
drwxrwx--- runner emails
288288
-rw-rw---- runner flatfile.txt
289-
drwxrwxrwx runner profiles
289+
drwxrwx--- runner profiles
290290
-rw-rw---- runner proxy.conf
291291
-rw-rw---- runner registry.cfg
292292
-rw-rw---- runner serverCert.profile
@@ -315,11 +315,11 @@ jobs:
315315
# everything should be owned by runner group
316316
# TODO: review owners/permissions
317317
cat > expected << EOF
318-
drwxrwxrwx runner backup
319-
drwxrwxrwx runner ca
320-
-rw-rw-rw- runner localhost.$DATE.log
318+
drwxrwx--- runner backup
319+
drwxrwx--- runner ca
320+
-rw-rw---- runner localhost.$DATE.log
321321
-rw-rw-rw- runner localhost_access_log.$DATE.txt
322-
drwxrwxrwx runner pki
322+
drwxrwx--- runner pki
323323
EOF
324324
325325
diff expected output
@@ -338,14 +338,14 @@ jobs:
338338
# everything should be owned by runner group
339339
# TODO: review owners/permissions
340340
cat > expected << EOF
341-
drwxrwxrwx runner backup
342-
drwxrwxrwx runner ca
341+
drwxrwx--- runner backup
342+
drwxrwx--- runner ca
343343
-rw-rw-rw- runner localhost_access_log.$DATE.txt
344344
EOF
345345
346346
cat > expected_new_tomcat10 << EOF
347-
drwxrwxrwx runner backup
348-
drwxrwxrwx runner ca
347+
drwxrwx--- runner backup
348+
drwxrwx--- runner ca
349349
-rw-rw-rw- runner localhost_access_log.$DATE.txt
350350
EOF
351351

0 commit comments

Comments
 (0)