From be6faee881e4e60916da17d960dc74f8dbc1d084 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 25 Sep 2025 11:53:23 -0700 Subject: [PATCH] Drop all user-instance checks The user-instance package was dropped in: https://src.fedoraproject.org/rpms/tomcat/c/4a35676781734e27eb64e2ac0ad2cd855c54c986?branch=rawhide so the tests now always fail because the package doesn't exist. Signed-off-by: Adam Williamson --- directory-structure/main.fmf | 1 - directory-structure/test.sh | 24 +----------- user-instance-check/jakartahelloworld.war | Bin 2549 -> 0 bytes user-instance-check/main.fmf | 5 --- user-instance-check/test.sh | 43 ---------------------- 5 files changed, 1 insertion(+), 72 deletions(-) delete mode 100644 user-instance-check/jakartahelloworld.war delete mode 100644 user-instance-check/main.fmf delete mode 100755 user-instance-check/test.sh diff --git a/directory-structure/main.fmf b/directory-structure/main.fmf index 583d28d..ae95c01 100644 --- a/directory-structure/main.fmf +++ b/directory-structure/main.fmf @@ -1,7 +1,6 @@ summary: Tomcat directory structure test description: Makes sure that Tomcat home directory has expected structure and that there are no dangling symlinks there. require+: - - tomcat-user-instance - tomcat-webapps - tomcat-admin-webapps - tomcat-docs-webapp diff --git a/directory-structure/test.sh b/directory-structure/test.sh index 50972fb..660ae69 100755 --- a/directory-structure/test.sh +++ b/directory-structure/test.sh @@ -28,19 +28,6 @@ rlJournalStart rlAssertExists ${CATALINA_HOME}/doc/ rlAssertExists ${CATALINA_HOME}/doc/RUNNING.txt rlAssertExists ${CATALINA_HOME}/lib/ - - rlAssertExists ${CATALINA_HOME}/user-instance/ - rlAssertExists ${CATALINA_HOME}/user-instance/bin/ - rlAssertExists ${CATALINA_HOME}/user-instance/bin/setenv.sh - rlAssertExists ${CATALINA_HOME}/user-instance/conf/ - rlAssertExists ${CATALINA_HOME}/user-instance/conf/catalina.policy - rlAssertExists ${CATALINA_HOME}/user-instance/conf/catalina.properties - rlAssertExists ${CATALINA_HOME}/user-instance/conf/context.xml - rlAssertExists ${CATALINA_HOME}/user-instance/conf/jaspic-providers.xml - rlAssertExists ${CATALINA_HOME}/user-instance/conf/logging.properties - rlAssertExists ${CATALINA_HOME}/user-instance/conf/server.xml - rlAssertExists ${CATALINA_HOME}/user-instance/conf/tomcat-users.xml - rlAssertExists ${CATALINA_HOME}/user-instance/conf/web.xml rlPhaseEnd rlPhaseStartTest "Check CATALINA_BASE directory structure" @@ -71,10 +58,6 @@ rlJournalStart rlAssertExists /etc/tomcat/conf.d/README rlPhaseEnd - rlPhaseStartTest "Check user instance script" - rlAssertExists /usr/bin/tomcat-user-instance-create - rlPhaseEnd - rlPhaseStartTest "Check systemd and sysusers" rlAssertExists /usr/lib/systemd/system/tomcat.service rlAssertExists /usr/lib/sysusers.d/tomcat.conf @@ -144,14 +127,9 @@ rlJournalStart rlAssertExists /usr/share/licenses/tomcat-jsp-3.1-api/LICENSE rlAssertExists /usr/share/licenses/tomcat-servlet-6.0-api/LICENSE rlAssertExists /usr/share/licenses/tomcat-lib/LICENSE - rlAssertExists /usr/share/licenses/tomcat-user-instance/LICENSE rlAssertExists /usr/share/licenses/tomcat-webapps/LICENSE rlPhaseEnd - rlPhaseStartTest "Check user instance man page" - rlAssertExists /usr/share/man/man1/tomcat-user-instance-create.1.gz - rlPhaseEnd - rlPhaseStartTest "Check maven metadata" rlAssertExists /usr/share/maven-metadata/tomcat.xml rlAssertExists /usr/share/maven-metadata/tomcat-tomcat-common.xml @@ -204,4 +182,4 @@ rlJournalStart rlJournalEnd -rlJournalPrintText \ No newline at end of file +rlJournalPrintText diff --git a/user-instance-check/jakartahelloworld.war b/user-instance-check/jakartahelloworld.war deleted file mode 100644 index a76c951868b8d27a75e05bbf21d43689adb0a2f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2549 zcmWIWW@h1HVBlb2SeDiv#ef7j85kIRT|*poJ^kGD1H748L>L%2IKaw$XIk6|WME(b zVG(3yzK(vLZmz*0dcJO-eb1cs@z&M5$m^}Eb?(gh%|QlNj2}EL()04w@$|h|x@t?% z2VWiUv%wtYJV6{MG=0yX2{yQ9%(${p>+BiNi(kD?UgOpC@ZA<;?W_4Lq}>wVs1fBDpC+` zT4Ww|F^j9Pj)8&UJ_7>-Ka$S!)Fi!%+??EgZ@xnYJTBjDU8mGO-sGBj?TuyQO1DRk zYeL+Y9$y~B(0E{X<>QIR|Mdl*Upm9o>(a$}*}A*bcYW%8eu{6w*@a8=nIbkPT=Vu@ ze3v(G!$RZR6-W1QWChP(;x8k}Cvft(n@w%x{!Y&bQy)vKH8R}?{`PO*TQ>h5tBvh^ zuDi^rvCVaRnS(YH1A`(91A`utQ;~xO=1Gs#oSgjN)S|MS)Dk_gg5Kchd?81Xe{D?O zn%jyti|2Q5XG#k1$)BLMEO52rRS~96J6?mvm8bRY$_ms^)1US00sjYg$@6c7R5mWl zF?)Vy&d+n-=UN(ne*L|FKEu4nkwSuNBs-P~IL|p~^LYM_qeHtyM&B;Wo}A)Bpr6pYR$fpq7iqrOzY3a*FTyPFN?oAQ97j{ zUfd{+;-lYXQI1{@$sPo|bV=TkDE0lX@ZZZML$Y8&`jyh;uqC z@OuqATb|LIFLx%Yrq!5iYZcYdy(MZ}^n1(PwQVIwPNrNDjq5JY?Mji#>%X1*&eL{2 z`{FLH5Z?ZSk%+9glSXS7cqs8(-&*xL%qFwG9bN@K*_xQBa>)4J1RV-7vb1s&itaJXS ze?6_kk*PA}<+d!pVmWThuP^N6Sgb55-%EG{4gj~qvCYGhWb$xYx30kC(O+`$f5f%=BNn@EG&`PEj^JMuCoey3 zro9rPD8pJ`;8w%DL!X`0VnjI3_`k2|H~rss_DYmn ze$~8~dH3y95;y#sp%=cs+u!ZQNkK6 zRrW9Eh+~|VhLx4xm)XYUYD{@g_bxk~u=vr<-8Y3w6)h8WTqKqU9TPBq^?Ehet*M30 zSE_7xSbCIho*!B2&>fRL)BSeBX(1lZ$>Q?!K3B_CT>g4IojYIiLvjDvOi2@^$L(xa zT@p)_E<4B7GkpI$YjVL#u`0c}hcgoHU7Oh@v`*&P=k3@23jI1R<`a8-7hB=kwR7?r z3jb$!RM{h97gW;-XZ_J~Wnf@%VPIgeBt3Quit-Cmi%K$6i@kNUPWpKJ=za9r_;u|U zuQPr+TAn=qzC}7354`kG>FY9dsXu@IYH66tGqER2il#0V6HR~i{HD|^$ro(DE!kMA zf3z1cG6Z-tGKnx_uL(f)AOr|7ymbVzkZMJcHr(|h3@m9>N7jZ^OX9N_RINb($l_H< zB`-c*plS}G>jIK4Sb2?4H>lb}=>CUAH>4889bBMl5MhD=Blc<(mUAI)frKEoY7qvO zG-e^01g#{IHG|R=dPM~TOBzL)@H+#u+CnxPTWJIXOB#DvkWvKEWfQXb*zyAmENRSQ cBiVdJ?g;Q^Wdj+-#lXdIlZk-KmY&$ diff --git a/user-instance-check/main.fmf b/user-instance-check/main.fmf deleted file mode 100644 index 84edecb..0000000 --- a/user-instance-check/main.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: Tomcat user instance package check -description: Create standalone Tomcat instances with tomcat-user-instance-create. Start Tomcats. Check they are running and serve deployed apps. Stop Tomcats. -require+: - - curl - - tomcat-user-instance diff --git a/user-instance-check/test.sh b/user-instance-check/test.sh deleted file mode 100755 index cbad7f5..0000000 --- a/user-instance-check/test.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -# Include Beaker environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -rlJournalStart - - rlPhaseStartSetup "Pre-Test Environment Setup" - rlLog "Create tomcat instances" - rlRun "tomcat-user-instance-create tomcatInstance1" 0 "Create tomcatInstance1" - rlRun "tomcat-user-instance-create -p 8081 -c 8006 tomcatInstance2" 0 "Create tomcatInstance2" - rlRun "tomcat-user-instance-create -p 8082 -c 8007 tomcatInstance3" 0 "Create tomcatInstance3" - rlLog "Deploy apps" - rlRun "cp jakartahelloworld.war tomcatInstance1/webapps" 0 "Copying sample webapp to tomcatInstance1" - rlRun "cp jakartahelloworld.war tomcatInstance2/webapps" 0 "Copying sample webapp to tomcatInstance2" - rlRun "cp jakartahelloworld.war tomcatInstance3/webapps" 0 "Copying sample webapp to tomcatInstance3" - rlLog "Start Tomcat instances" - rlRun "tomcatInstance1/bin/startup.sh" 0 "Starting tomcatInstance1" - rlRun "tomcatInstance2/bin/startup.sh" 0 "Starting tomcatInstance2" - rlRun "tomcatInstance3/bin/startup.sh" 0 "Starting tomcatInstance3" - rlPhaseEnd - - rlPhaseStartTest "Verify Tomcat instances Functionality" - sleep 10 - rlLog "Checking Tomcats via curl" - rlAssertExists tomcatInstance1/webapps/jakartahelloworld - rlAssertExists tomcatInstance2/webapps/jakartahelloworld - rlAssertExists tomcatInstance3/webapps/jakartahelloworld - rlRun "curl http://localhost:8080/jakartahelloworld/hello | grep '

Hello, World! This is a Jakarta Servlet!'" 0 "Sample servlet of tomcatInstance1" - rlRun "curl http://localhost:8081/jakartahelloworld/hello | grep '

Hello, World! This is a Jakarta Servlet!'" 0 "Sample servlet of tomcatInstance2" - rlRun "curl http://localhost:8082/jakartahelloworld/hello | grep '

Hello, World! This is a Jakarta Servlet!'" 0 "Sample servlet of tomcatInstance3" - rlPhaseEnd - - rlPhaseStartCleanup "Post-Test Teardown" - rlLog "Stopping Tomcat instances" - rlRun "tomcatInstance1/bin/shutdown.sh" 0 "Stopping tomcatInstance1" - rlRun "tomcatInstance2/bin/shutdown.sh" 0 "Stopping tomcatInstance2" - rlRun "tomcatInstance3/bin/shutdown.sh" 0 "Stopping tomcatInstance3" - rlPhaseEnd - - -rlJournalEnd -rlJournalPrintText \ No newline at end of file