Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

debian12 github ci runner adjustments #338

Merged
merged 25 commits into from
Dec 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c8315ca
fix dbtool fo postgres plperl function
rkrenn Dec 22, 2024
f1df151
debian12 github ci runner: postgres 15 adjustments
rkrenn Dec 22, 2024
35a1f55
debian12 github ci runner: switch to tomcat10
rkrenn Dec 22, 2024
a394835
debian12 github ci runner: maven_opts with add-opens
rkrenn Dec 22, 2024
7c60e07
debian12 github ci runner: JDK_JAVA_OPTIONS with add-opens
rkrenn Dec 23, 2024
a3f3a32
debian12 github ci runner: JDK_JAVA_OPTIONS with add-opens #1
rkrenn Dec 23, 2024
349456f
debian12 github ci runner: switch to tomcat10 #1
rkrenn Dec 23, 2024
94a24aa
debian12 github ci runner: switch to tomcat10 #2
rkrenn Dec 23, 2024
702a9aa
debian12 github ci runner: switch to tomcat10 #3
rkrenn Dec 25, 2024
b2c219f
debian12 github ci runner: switch to tomcat10 #4
rkrenn Dec 25, 2024
785421d
debian12 github ci runner: use opens option in dbtool in jobs
rkrenn Dec 25, 2024
8bd385a
debian12 github ci runner: use opens option in dbtool in jobs #1
rkrenn Dec 25, 2024
fd177e1
debian12 github ci runner: use opens option in dbtool in jobs #2
rkrenn Dec 26, 2024
fa97929
debian12 github ci runner: use opens option in dbtool in jobs #3
rkrenn Dec 26, 2024
7c657e0
debian12 github ci runner: use opens option in dbtool in jobs #4
rkrenn Dec 26, 2024
780db9c
debian12 github ci runner: use opens option in dbtool in jobs #5
rkrenn Dec 26, 2024
234a395
debian12 github ci runner: use opens option in dbtool in jobs #6
rkrenn Dec 26, 2024
694ff5c
debian12 github ci runner: use opens option in dbtool in jobs #7
rkrenn Dec 26, 2024
c7aa58b
override com.sun.jersey.spi.container.servlet.WebComponent
rkrenn Dec 26, 2024
1a72d7a
override com.sun.jersey.spi.container.servlet.WebComponent #1
rkrenn Dec 26, 2024
841a729
override com.sun.jersey.spi.container.servlet.WebComponent #2
rkrenn Dec 26, 2024
6354093
override com.sun.jersey.spi.container.servlet.WebComponent #3
rkrenn Dec 26, 2024
b8d6442
override com.sun.jersey.spi.container.servlet.WebComponent #4
rkrenn Dec 26, 2024
912d72f
override com.sun.jersey.spi.container.servlet.WebComponent #5
rkrenn Dec 26, 2024
6ac4f84
override com.sun.jersey.spi.container.servlet.WebComponent #6
rkrenn Dec 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/dbtool.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/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

#$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 -Djava.awt.headless=true --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED -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 --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED -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 $*
Binary file not shown.
7 changes: 4 additions & 3 deletions .github/workflows/run_selenium_test.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash
#CTSMS_PROPERTIES=/ctsms/properties
#CTSMS_JAVA=/ctsms/java
CTSMS_PROPERTIES=/ctsms/properties
CTSMS_JAVA=/ctsms/java
export JDK_JAVA_OPTIONS="--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED"
#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/}}
Expand All @@ -10,4 +11,4 @@ mvn surefire:test -DCTSMS_PROPERTIES="$CTSMS_PROPERTIES" -DCTSMS_JAVA="$CTSMS_JA
#sudo $JAVA_HOME/bin/java -Dfile.encoding=Cp1252 -Dwebdriver.chrome.driver=/usr/bin/chromedriver -classpath /home/runner/work/ctsms/ctsms/core/target/test-classes/:/home/runner/work/ctsms/ctsms/selenium-server-standalone-4.4.0.jar $*
#javac -classpath /home/runner/work/ctsms/ctsms/selenium-server-standalone-3.141.59.jar /home/runner/work/ctsms/ctsms/core/src/test/java/org/phoenixctms/ctsms/selenium/$1.java
#sudo java -Dwebdriver.chrome.driver=/usr/bin/chromedriver -classpath /home/runner/work/ctsms/ctsms/selenium-server-standalone-3.141.59.jar:/home/runner/work/ctsms/ctsms/core/src/test/java/ org.phoenixctms.ctsms.selenium.$1

#sudo journalctl --unit tomcat10.service -p err
2 changes: 1 addition & 1 deletion .github/workflows/setup_database.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ mvn -f core/pom.xml org.andromda.maven.plugins:andromdapp-maven-plugin:schema -D
sudo useradd ctsms -p '*' --groups sudo
#sudo apt-get install --yes postgresql
sudo apt-get -q -y install postgresql-plperl
sudo sed -r -i "s|#*join_collapse_limit.*|join_collapse_limit = 1|" /etc/postgresql/14/main/postgresql.conf
sudo sed -r -i "s|#*join_collapse_limit.*|join_collapse_limit = 1|" /etc/postgresql/15/main/postgresql.conf
sudo service postgresql start
sudo -u postgres psql postgres -c "CREATE USER ctsms WITH PASSWORD 'ctsms';"
sudo -u postgres psql postgres -c "CREATE DATABASE ctsms;"
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/setup_tomcat10.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/bin/bash

apt-get -q -y -o=Dpkg::Use-Pty=0 install tomcat10
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 "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
tar -xvzf /home/runner/work/ctsms/ctsms/.github/workflows/jakartaee-migration-1.0.8-bin.tar.gz -C /ctsms
/ctsms/jakartaee-migration-1.0.8/bin/migrate.sh /home/runner/work/ctsms/ctsms/web/target/ctsms-$VERSION.war /home/runner/work/ctsms/ctsms/web/target/ctsms-$VERSION-migrated.war
chmod 755 /home/runner/work/ctsms/ctsms/web/target/ctsms-$VERSION-migrated.war
rm /var/lib/tomcat10/webapps/ROOT/ -rf
#cp /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/*
cp /home/runner/work/ctsms/ctsms/web/target/ctsms-$VERSION-migrated.war /var/lib/tomcat10/webapps/ROOT.war
systemctl daemon-reload
systemctl start tomcat10
File renamed without changes.
10 changes: 4 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Set up JDK 11
- name: Set up JDK
run: |
sudo apt-get update
sudo apt-get -q -y install default-jdk
Expand Down Expand Up @@ -61,8 +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
- name: Setup BulkProcessor
run: |
sudo chmod 755 /home/runner/work/ctsms/ctsms/.github/workflows/setup_bulkprocessor.sh
Expand Down Expand Up @@ -98,14 +96,14 @@ jobs:
sudo chmod 777 /home/runner/work
sudo chmod 777 /home/runner/work/ctsms
sudo chmod 777 /home/runner/work/ctsms/ctsms/web -R
- name: Initialize DB
- name: Initialize database
run: |
sudo chmod 755 /home/runner/work/ctsms/ctsms/.github/workflows/init_database.sh
/home/runner/work/ctsms/ctsms/.github/workflows/init_database.sh
- name: Setup Tomcat
run: |
sudo chmod 755 /home/runner/work/ctsms/ctsms/.github/workflows/setup_tomcat.sh
sudo -E /home/runner/work/ctsms/ctsms/.github/workflows/setup_tomcat.sh
sudo chmod 755 /home/runner/work/ctsms/ctsms/.github/workflows/setup_tomcat10.sh
sudo -E /home/runner/work/ctsms/ctsms/.github/workflows/setup_tomcat10.sh
- name: Setup ChromeDriver
run: |
sudo chmod 755 /home/runner/work/ctsms/ctsms/.github/workflows/setup_selenium.sh
Expand Down
4 changes: 2 additions & 2 deletions core/db/dbtool.sql
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ CREATE OR REPLACE FUNCTION dbtool (VARIADIC CHARACTER VARYING(1024)[]) RETURNS C
AS $$
my ($args) = @_;
my $cmd = "/ctsms/build/ctsms/core/db/dbtool.sh" . join(" ", @$args);
return qx $cmd;
$$ LANGUAGE plperlu;
return qx!$cmd!;
$$ LANGUAGE plperlu;
Loading
Loading