Merge branch 'staging' into 1871-DAPS-bug-query-api-test-endless-loop

Author: JoshuaSBrown

.github/workflows/javascript-lint.yml

@@ -19,7 +19,7 @@ jobs:
             - name: Install ESLint
               run: |
                   npm init -y
-                  npm install eslint@latest @babel/eslint-parser@latest eslint-define-config globals eslint-plugin-jsdoc --save
+                  npm install eslint@^9 @babel/eslint-parser@latest eslint-define-config globals eslint-plugin-jsdoc --save
                   npx eslint "**/*.js"
 
             # Step 4: Report status

.gitignore

@@ -52,7 +52,7 @@ scripts/globus/mapping.json
 scripts/admin_datafed_backup.sh
 scripts/admin_refresh_certs.sh
 scripts/globus/__pycache__
-services/
+/services/
 tests/mock_core/Version.hpp
 tmp
 web/SDMS.proto

.gitlab/build/build_core_image.yml

@@ -31,6 +31,7 @@ build-gcs-base:
         - echo "$BRANCH_LOWER"
         - source "scripts/dependency_versions.sh"
         - cd "external/globus-connect-server-deploy/docker"
+        - git fetch origin "$DATAFED_GCS_SUBMODULE_VERSION"
         - git checkout "$DATAFED_GCS_SUBMODULE_VERSION"
         - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
         - docker build --no-cache --progress plain -t "${REGISTRY}/${PROJECT}/${COMPONENT}-${BRANCH_LOWER}:latest" - < "./docker-files/Dockerfile.${GCS_BASE_IMAGE_DISTRO}"

.gitlab/build/build_foxx_image.yml

@@ -18,6 +18,7 @@ build-gcs-base:
         - echo "$BRANCH_LOWER"
         - source "scripts/dependency_versions.sh"
         - cd "external/globus-connect-server-deploy/docker"
+        - git fetch origin "$DATAFED_GCS_SUBMODULE_VERSION"
         - git checkout "$DATAFED_GCS_SUBMODULE_VERSION"
         - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
         - docker build --no-cache --progress plain -t "${REGISTRY}/${PROJECT}/${COMPONENT}-${BRANCH_LOWER}:latest" - < "./docker-files/Dockerfile.${GCS_BASE_IMAGE_DISTRO}"

.gitlab/build/build_gcs_base_image.yml

@@ -0,0 +1,18 @@
+---
+stages:
+    - build
+
+include:
+    - local: .gitlab/common.yml
+
+retag-image:
+    extends: .docker_retag_image
+    stage: build
+    variables:
+        PROJECT: "datafed"
+        COMPONENT: "core"
+        GIT_STRATEGY: clone
+        DATAFED_HARBOR_REGISTRY: "$REGISTRY" # needed by c_harbor_artifact_count
+        BUILD_INTERMEDIATE: "FALSE"
+    tags:
+        - docker