Merge branch 'development' into updateDCClustering

Author: tongtongcao

.containers/coatjava.Dockerfile

@@ -0,0 +1,25 @@
+#syntax=docker/dockerfile:1
+
+FROM ubuntu:noble
+
+LABEL name="coatjava"
+LABEL maintainer="Whitney Armstrong <[email protected]>"
+LABEL architecture="amd64"
+
+USER root
+
+
+RUN apt update && apt upgrade -y
+RUN apt install cmake vim maven groovy git ca-certificates wget curl python-is-python3 \
+                openjdk-17-jdk openjdk-17-jre openjdk-17-jdk-headless openjdk-17-jre-headless \
+                python3-sqlalchemy -y && update-ca-certificates
+
+# CA certificates
+ADD https://pki.jlab.org/JLabCA.crt /etc/ssl/certs/JLabCA.crt 
+#RUN trust anchor --store /image/JLabCA.crt
+
+ARG REF_NAME=development 
+# build coatjava 
+RUN java --version && cd /opt && \
+    git clone https://code.jlab.org/hallb/alert/coatjava.git && cd coatjava && \
+    git fetch origin && git checkout ${REF_NAME} && ./build-coatjava.sh 

.github/workflows/maven.yml

@@ -21,9 +21,9 @@ defaults:
     shell: bash
 
 env:
-  java_version: 11
+  java_version: 17
   java_distribution: zulu
-  groovy_version: 4.0.3
+  groovy_version: 4.x
 
 jobs:
 

.github/workflows/validation.yml

@@ -10,3 +10,17 @@ on:
 jobs:
   validation:
     uses: JeffersonLab/clas12-validation/.github/workflows/ci.yml@main
+    with:
+      matrix_evgen: >-
+        [
+          "e_p",
+          "e_n",
+          "e_g",
+          "e_pC",
+          "eFT_K",
+          "e_gFT"
+        ]
+      matrix_config: >-
+        [
+          "rgb_fall2019"
+        ]

.gitlab-ci.yml

@@ -0,0 +1,40 @@
+workflow:
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: '$CI_PIPELINE_SOURCE == "web"'
+    - if: '$CI_PIPELINE_SOURCE == "webide"'
+    - if: '$CI_COMMIT_BRANCH == "master"'
+    - if: '$CI_COMMIT_BRANCH == "development"'
+    - if: '$CI_COMMIT_TAG'
+
+default:
+  image: ubuntu:noble
+  retry: 2
+
+coatjava_build:
+  image: gcr.io/kaniko-project/executor:debug
+  script:
+    - echo "${CI_COMMIT_REF_NAME}"
+    - >-
+      /kaniko/executor
+      --context     $CI_PROJECT_DIR/docker
+      --dockerfile  $CI_PROJECT_DIR/.containers/coatjava.Dockerfile
+      --destination $CI_REGISTRY_IMAGE/coatjava:${CI_COMMIT_REF_NAME}
+      --build-arg REF_NAME=${CI_COMMIT_REF_NAME}
+    
+alert_testing:
+  needs: ["coatjava_build"]
+  variables:
+    REF_NAME: "$CI_COMMIT_REF_NAME"
+  trigger:
+    project: hallb/alert/c12
+    strategy: depend
+
+shared_for_alert_tests:
+  needs: ["coatjava_build"]
+  variables:
+    REF_NAME: "$CI_COMMIT_REF_NAME"
+  trigger:
+    project: hallb/alert/atof/shared_for_alert
+    strategy: depend
+

bin/bg-merger

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

bin/bos2hipo

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 java -Xms1024m -XX:+UseSerialGC \
     -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" \

bin/cvt-compare

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

bin/daqEventViewer

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 java -Xms1024m \
     -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" \

bin/dclayereffs-ana

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 java -Dsun.java2d.pmoffscreen=false -Xmx2048m -Xms1024m \
     -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/utils/*:$CLAS12DIR/lib/services/*" \

bin/decoder

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1