debian12 github ci runner: use opens option in dbtool in jobs #2

phoenixctms · Dec 26, 2024 · fd177e1 · fd177e1
1 parent 8bd385a
commit fd177e1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/dbtool.sh b/.github/workflows/dbtool.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
 #VERSION=$(grep -oP '<application.version>\K[^<]+' /home/runner/work/ctsms/ctsms/pom.xml)
-#CTSMS_PROPERTIES=/ctsms/properties
-#CTSMS_JAVA=/ctsms/java
+CTSMS_PROPERTIES=/ctsms/properties
+CTSMS_JAVA=/ctsms/java
+JDK_JAVA_OPTIONS=--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED
 
 #$JAVA_HOME/bin/java -DCTSMS_PROPERTIES="$CTSMS_PROPERTIES" -DCTSMS_JAVA="$CTSMS_JAVA" -Dfile.encoding=Cp1252 -Djava.awt.headless=true -classpath /home/runner/work/ctsms/ctsms/web/target/ctsms-$VERSION/WEB-INF/lib/ctsms-core-$VERSION.jar:/home/runner/work/ctsms/ctsms/web/target/ctsms-$VERSION/WEB-INF/lib/* org.phoenixctms.ctsms.executable.DBTool $*
 
-$JAVA_HOME/bin/java -DCTSMS_PROPERTIES="$CTSMS_PROPERTIES" -DCTSMS_JAVA="$CTSMS_JAVA" -Dfile.encoding=Cp1252 $JDK_JAVA_OPTIONS -Djava.awt.headless=true -classpath /home/runner/work/ctsms/ctsms/web/target/ctsms-1.8.1/WEB-INF/lib/ctsms-core-1.8.1.jar:/home/runner/work/ctsms/ctsms/web/target/ctsms-1.8.1/WEB-INF/lib/* org.phoenixctms.ctsms.executable.DBTool $*
+$JAVA_HOME/bin/java -DCTSMS_PROPERTIES="$CTSMS_PROPERTIES" -DCTSMS_JAVA="$CTSMS_JAVA" -Dfile.encoding=Cp1252 -Djava.awt.headless=true -classpath /home/runner/work/ctsms/ctsms/web/target/ctsms-1.8.1/WEB-INF/lib/ctsms-core-1.8.1.jar:/home/runner/work/ctsms/ctsms/web/target/ctsms-1.8.1/WEB-INF/lib/* org.phoenixctms.ctsms.executable.DBTool $*
diff --git a/.github/workflows/run_selenium_test.sh b/.github/workflows/run_selenium_test.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
-#CTSMS_PROPERTIES=/ctsms/properties
-#CTSMS_JAVA=/ctsms/java
+CTSMS_PROPERTIES=/ctsms/properties
+CTSMS_JAVA=/ctsms/java
+echo "JDK_JAVA_OPTIONS=--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED" >> $GITHUB_ENV
 #VERSION=$(grep -oP '<application.version>\K[^<]+' /home/runner/work/ctsms/ctsms/pom.xml)
 #cat /var/lib/tomcat9/logs/catalina.out
 BRANCH=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}

diff --git a/.github/workflows/setup_tomcat10.sh b/.github/workflows/setup_tomcat10.sh
@@ -5,8 +5,8 @@ systemctl stop tomcat10
 usermod --append --groups ctsms tomcat
 #VERSION=$(grep -oP '<application.version>\K[^<]+' /home/runner/work/ctsms/ctsms/pom.xml)
 #sed -r -i "s/^JAVA_OPTS.+/JAVA_OPTS=\"-server -Djava.awt.headless=true -Xms$XMS -Xmx$XMX -Xss$XSS -XX:+UseParallelGC -XX:MaxGCPauseMillis=1500 -XX:GCTimeRatio=9 -XX:+CMSClassUnloadingEnabled -XX:ReservedCodeCacheSize=$PERM\"/" /etc/default/tomcat9
-echo "CTSMS_PROPERTIES=$CTSMS_PROPERTIES" >>/etc/default/tomcat10
-echo "CTSMS_JAVA=$CTSMS_JAVA" >>/etc/default/tomcat10
+echo "CTSMS_PROPERTIES=/ctsms/properties" >>/etc/default/tomcat10
+echo "CTSMS_JAVA=/ctsms/java" >>/etc/default/tomcat10
 #echo "JDK_JAVA_OPTIONS=--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED" >>/etc/default/tomcat10
 sed -r -i "s|# Lifecycle|EnvironmentFile=/etc/default/tomcat10\\n\\n# Lifecycle|" /usr/lib/systemd/system/tomcat10.service
 sed -r -i "s|# Security|# Security\\nReadWritePaths=/ctsms/external_files/ /ctsms/bulk_processor/output/ /ctsms/ /tmp/|" /usr/lib/systemd/system/tomcat10.service

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -61,9 +61,6 @@ jobs:
         run: |
           sudo chmod 755 /home/runner/work/ctsms/ctsms/.github/workflows/download_masterdata.sh
           sudo /home/runner/work/ctsms/ctsms/.github/workflows/download_masterdata.sh
-          echo "CTSMS_PROPERTIES=/ctsms/properties" >> $GITHUB_ENV
-          echo "CTSMS_JAVA=/ctsms/java" >> $GITHUB_ENV
-          echo "JDK_JAVA_OPTIONS=--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED" >> $GITHUB_ENV
       - name: Setup BulkProcessor
         run: |
           sudo chmod 755 /home/runner/work/ctsms/ctsms/.github/workflows/setup_bulkprocessor.sh