[DAPS-1770] - release: v4.0.0

.github/workflows/build-docs.yml

@@ -40,7 +40,7 @@ jobs:
                   ./scripts/generate_datafed.sh
             - name: Install documentation build dependencies
               run: |
-                  sudo ./scripts/install_docs_dependencies.sh
+                  sudo ./external/DataFedDependencies/scripts/install_docs_dependencies.sh
             - name: Build documentation
               run: |
                   cmake -S. -B build -DBUILD_AUTHZ=OFF -DBUILD_CORE_SERVER=OFF -DBUILD_COMMON=OFF -DBUILD_DOCS=ON -DBUILD_FOXX=OFF -DBUILD_REPO_SERVER=OFF -DBUILD_PYTHON_CLIENT=ON -DBUILD_TESTS=OFF -DBUILD_WEB_SERVER=OFF -DENABLE_UNIT_TESTS=OFF

.github/workflows/unit-tests.yml

@@ -10,9 +10,12 @@ jobs:
             - name: Update debian
               run: apt update
             - name: Install dependencies
+              with:
+                  submodules: recursive
+                  fetch-depth: 0
               run: |
                   ./scripts/generate_datafed.sh
-                  ./scripts/install_core_dependencies.sh
+                  ./external/DataFedDependencies/scripts/install_core_dependencies.sh
             - name: Build
               run: |
                   /opt/datafed/dependencies/bin/cmake -S. -B build -DCMAKE_BUILD_TYPE=Debug -DBUILD_WEB_SERVER=OFF

.gitignore

@@ -53,7 +53,8 @@ scripts/admin_datafed_backup.sh
 scripts/admin_refresh_certs.sh
 scripts/globus/__pycache__
 services/
-tmp/
+tests/mock_core/Version.hpp
+tmp
 web/SDMS.proto
 web/SDMS_Anon.proto
 web/SDMS_Auth.proto
@@ -65,6 +66,8 @@ web/package-lock.json
 web/static/datafed-core-key.pub
 *.swp
 *.swo
+*.tar.gz
+*.tgz
 
 # for web tests
 tests/end-to-end/web-UI/node_modules/

.gitlab-ci.yml

@@ -18,6 +18,7 @@ include:
     - local: .gitlab/stage_pipeline_serialize.yml
     - local: .gitlab/infrastructure.yml
     - local: .gitlab/stage_clear_cache.yml
+    - local: .gitlab/stage_base_image_check.yml
     - local: .gitlab/stage_build_base.yml
     - local: .gitlab/stage_provision_client.yml
     - local: .gitlab/stage_image_check.yml
@@ -32,6 +33,7 @@ stages:
     - trigger-infrastructure
     - signal
     - clear-docker-cache
+    - base-image-check
     - build-base
     - provision-client
     - image-check
@@ -56,3 +58,4 @@ variables:
     REGISTRY: "camden.ornl.gov"
     DATAFED_DEPENDENCIES_INSTALL_PATH: "/shared/install"
     DOCKER_TLS_CERTDIR: "" # Required for running docker in docker
+    GIT_SUBMODULE_STRATEGY: recursive

.gitlab/build/build_core_image.yml

@@ -1,53 +1,53 @@
 ---
 stages:
-  - build
+    - build
 
 include:
-  - local: .gitlab/common.yml
+    - local: .gitlab/common.yml
 
 build-core:
-  extends: .docker_build_script
-  stage: build
-  variables:
-    PROJECT: "datafed"
-    COMPONENT: "core"
-    GIT_STRATEGY: clone
-    DOCKER_FILE_PATH: "core/docker/Dockerfile"
-    DATAFED_HARBOR_REGISTRY: "$REGISTRY" # needed by c_harbor_artifact_count
-    BUILD_INTERMEDIATE: "FALSE"
-  tags:
-    - ci-datafed-core
-    - docker
-  rules:
-    - changes:
-        - docker/**/*
-        - scripts/**/*
-        - core/**/*
-        - common/**/*
-        - CMakeLists.txt
-        - cmake/**/*
-        - .gitlab-ci.yml
-      when: on_success
+    extends: .docker_build_script
+    stage: build
+    variables:
+        PROJECT: "datafed"
+        COMPONENT: "core"
+        GIT_STRATEGY: clone
+        DOCKER_FILE_PATH: "core/docker/Dockerfile"
+        DATAFED_HARBOR_REGISTRY: "$REGISTRY" # needed by c_harbor_artifact_count
+        BUILD_INTERMEDIATE: "FALSE"
+    tags:
+        - ci-datafed-core
+        - docker
+    rules:
+        - changes:
+              - docker/**/*
+              - scripts/**/*
+              - core/**/*
+              - common/**/*
+              - CMakeLists.txt
+              - cmake/**/*
+              - .gitlab-ci.yml
+          when: on_success
 
 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
-  rules:
-    - changes:
-        - docker/**/*
-        - scripts/**/*
-        - core/**/*
-        - common/**/*
-        - CMakeLists.txt
-        - cmake/**/*
-        - .gitlab-ci.yml
-      when: never
-    - when: on_success
+    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
+    rules:
+        - changes:
+              - docker/**/*
+              - scripts/**/*
+              - core/**/*
+              - common/**/*
+              - CMakeLists.txt
+              - cmake/**/*
+              - .gitlab-ci.yml
+          when: never
+        - when: on_success

.gitlab/build/build_foxx_image.yml

@@ -1,56 +1,56 @@
 ---
 stages:
-  - build
+    - build
 
 include:
-  - local: .gitlab/common.yml
+    - local: .gitlab/common.yml
 
 build-foxx:
-  extends: .docker_build_script
-  stage: build
-  variables:
-    PROJECT: "datafed"
-    COMPONENT: "foxx"
-    GIT_STRATEGY: clone
-    DOCKER_FILE_PATH: "docker/Dockerfile.foxx"
-    DATAFED_HARBOR_REGISTRY: "$REGISTRY" # needed by c_harbor_artifact_count
-    BUILD_INTERMEDIATE: "FALSE"
-  tags:
-    - docker
-  rules:
-    - changes:
-        - docker/**/*
-        - scripts/**/*
-        - cmake/**/*
-        - core/database/**/*
-        - core/CMakeLists.txt
-        - common/proto/**/*
-        - .gitlab-ci.yml
-        - .gitlab/**/*
-        - CMakeLists.txt
-      when: on_success
+    extends: .docker_build_script
+    stage: build
+    variables:
+        PROJECT: "datafed"
+        COMPONENT: "foxx"
+        GIT_STRATEGY: clone
+        DOCKER_FILE_PATH: "docker/Dockerfile.foxx"
+        DATAFED_HARBOR_REGISTRY: "$REGISTRY" # needed by c_harbor_artifact_count
+        BUILD_INTERMEDIATE: "FALSE"
+    tags:
+        - docker
+    rules:
+        - changes:
+              - docker/**/*
+              - scripts/**/*
+              - cmake/**/*
+              - core/database/**/*
+              - core/CMakeLists.txt
+              - common/proto/**/*
+              - .gitlab-ci.yml
+              - .gitlab/**/*
+              - CMakeLists.txt
+          when: on_success
 
 retag-image:
-  extends: .docker_retag_image
-  stage: build
-  variables:
-    PROJECT: "datafed"
-    COMPONENT: "foxx"
-    GIT_STRATEGY: clone
-    DATAFED_HARBOR_REGISTRY: "$REGISTRY" # needed by c_harbor_artifact_count
-    BUILD_INTERMEDIATE: "FALSE"
-  tags:
-    - docker
-  rules:
-    - changes:
-        - docker/**/*
-        - scripts/**/*
-        - cmake/**/*
-        - core/database/**/*
-        - core/CMakeLists.txt
-        - common/proto/**/*
-        - .gitlab-ci.yml
-        - .gitlab/**/*
-        - CMakeLists.txt
-      when: never
-    - when: on_success
+    extends: .docker_retag_image
+    stage: build
+    variables:
+        PROJECT: "datafed"
+        COMPONENT: "foxx"
+        GIT_STRATEGY: clone
+        DATAFED_HARBOR_REGISTRY: "$REGISTRY" # needed by c_harbor_artifact_count
+        BUILD_INTERMEDIATE: "FALSE"
+    tags:
+        - docker
+    rules:
+        - changes:
+              - docker/**/*
+              - scripts/**/*
+              - cmake/**/*
+              - core/database/**/*
+              - core/CMakeLists.txt
+              - common/proto/**/*
+              - .gitlab-ci.yml
+              - .gitlab/**/*
+              - CMakeLists.txt
+          when: never
+        - when: on_success