Merge branch 'master' into EVup

.gitlab/gitlab-ci-spack.yml

@@ -1,14 +1,20 @@
-#  This file is used to define the GitLab CI/CD pipeline for the ADIOS2 project.
-.common-sanitizer:
-  variables:
-    GITLAB_SITE: "UO CI (gitlab.spack.io)"
-    CI_BIN_DIR:  "$CI_PROJECT_DIR/build"
+default:
+  interruptible: true
   tags:
     - medium
     - uo
     - public
     - x86_64
-  interruptible: true
+
+#  This file is used to define the GitLab CI/CD pipeline for the ADIOS2 project.
+.common-sanitizer:
+  rules:
+    - if: '$CI_PIPELINE_SOURCE != "schedule"'
+      when: on_success
+    - when: never
+  variables:
+    GITLAB_SITE: "UO CI (gitlab.spack.io)"
+    CI_BIN_DIR:  "$CI_PROJECT_DIR/build"
 
 .common-build:
   extends:
@@ -82,3 +88,41 @@ test:uo-sanitizer-ubsan:
   image: ornladios/adios2:ci-fedora-ubsan
   extends: [.common-test]
   needs: [build:uo-sanitizer-ubsan]
+
+deploy:sync-ornl:
+  environment: ornl
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+      when: on_success
+    - when: never
+  image: ornladios/adios2:sync-20241206-b
+  script: >
+    .gitlab/config/SpackCIBridge.py
+    ornladios/ADIOS2
+    [email protected]:ecpcitest/adios2.git
+    https://code.ornl.gov/
+    ecpcitest/adios2
+    --prereq-check=format
+    --prereq-check=git_checks
+    --disable-status-post
+  dependencies: []
+  needs: []
+
+deploy:sync-spack:
+  environment: spackio
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+      when: on_success
+    - when: never
+  image: ornladios/adios2:sync-20241206-b
+  script: >
+    .gitlab/config/SpackCIBridge.py
+    ornladios/ADIOS2
+    [email protected]:adios2/adios2.git
+    https://gitlab.spack.io/
+    adios2/ADIOS2
+    --prereq-check=format
+    --prereq-check=git_checks
+    --status-context="Frank CI (sanitizers)"
+  dependencies: []
+  needs: []

cmake/install/post/generate-adios2-config.sh.in

@@ -4,6 +4,8 @@
 unset MAKEFLAGS
 unset MAKE
 
+declare PREFIX
+
 function make_target_flags() {
   local tgt=$1
   sleep 1
@@ -58,21 +60,17 @@ function prefixify() {
   echo "$@" | sed "s|${PREFIX}|\${ADIOS2_PREFIX}|g"
 }
 
-PREFIX="$1"
+###########################################################################
+# Main
+arg_prefix="$1"
 
-if [ "${1:0:1}" != "/" ]
+# Prefix should be an absolute path, but if it's not, make it absolute
+if [ "${arg_prefix:0:1}" != "/" ]
 then
-  # Convert relative paths to absolute based on DESTDIR
-  PREFIX="${DESTDIR:-$(pwd)}/$1"
-else
-  # Check if the DESTDIR directory exists and prepend it to PREFIX
-  if [ -d "${DESTDIR}" ]
-  then
-    PREFIX="${DESTDIR}$1"
-  fi
+  PREFIX="$PWD/$arg_prefix"
 fi
 
-shift
+PREFIX="${DESTDIR}${arg_prefix}"
 
 CMAKE="@CMAKE_COMMAND@"
 SOURCE_DIR="@ADIOS2_SOURCE_DIR@/cmake/install/post/adios2-config-dummy"

scripts/ci/images/sync.dockerfile

@@ -0,0 +1,6 @@
+from python:3.6.15
+
+# run apt install without asking user
+RUN DEBIAN_FRONTEND=noninteractive apt update && \
+    apt -y install --no-install-recommends ssh git && \
+    pip install python-dateutil PyGithub