From 1f94c07c2d48c1996883128699c8f9bdd14e1887 Mon Sep 17 00:00:00 2001
From: Niels Alexander Buegel <niels.alexander.bugel@cern.ch>
Date: Tue, 21 Jan 2025 16:28:30 +0100
Subject: [PATCH] Collapse docker/ctafrontend/ to docker/
---
.github/workflows/sonar-source.yml | 4 ++--
.gitlab/ci/build-image.gitlab-ci.yml | 4 ++--
.gitlab/ci/setup.gitlab-ci.yml | 4 ++--
.gitlab/ci/tests.gitlab-ci.yml | 6 +++---
.gitlab/ci/validation.gitlab-ci.yml | 4 ++--
continuousintegration/README.md | 2 +-
continuousintegration/ci_helpers/build_rpm.sh | 8 ++++----
.../ci_helpers/find_versionlock_list.sh | 8 ++++----
continuousintegration/ci_runner/build_image.sh | 6 +++---
.../docker/{ctafrontend => }/alma9/Dockerfile | 6 +++---
.../alma9/etc/yum.repos.d-public/ceph.repo | 0
.../etc/yum.repos.d-public/eos-citrine-depend.repo | 0
.../yum.repos.d-public/oracle-instant-client.repo | 0
.../etc/yum.repos.d-public/xrootd-stable.repo | 0
.../alma9/etc/yum.repos.d/ceph.repo | 0
.../alma9/etc/yum.repos.d/cta-ci.repo | 0
.../alma9/etc/yum.repos.d/cta-public-testing.repo | 0
.../alma9/etc/yum.repos.d/eos-citrine-depend.repo | 0
.../alma9/etc/yum.repos.d/xrootd-stable.repo | 0
.../alma9/etc/yum/pluginconf.d/versionlock.list | 0
.../docker/{ctafrontend => }/alma9/tag.Dockerfile | 4 ++--
.../{ctafrontend => }/opt/run/bin/init_pod.sh | 0
.../orchestration/tests/README_restore_files.md | 14 +++++++-------
.../orchestration/tests/test_liquibase_update.sh | 2 +-
cta-release/CMakeLists.txt | 4 ++--
25 files changed, 38 insertions(+), 38 deletions(-)
rename continuousintegration/docker/{ctafrontend => }/alma9/Dockerfile (90%)
rename continuousintegration/docker/{ctafrontend => }/alma9/etc/yum.repos.d-public/ceph.repo (100%)
rename continuousintegration/docker/{ctafrontend => }/alma9/etc/yum.repos.d-public/eos-citrine-depend.repo (100%)
rename continuousintegration/docker/{ctafrontend => }/alma9/etc/yum.repos.d-public/oracle-instant-client.repo (100%)
rename continuousintegration/docker/{ctafrontend => }/alma9/etc/yum.repos.d-public/xrootd-stable.repo (100%)
rename continuousintegration/docker/{ctafrontend => }/alma9/etc/yum.repos.d/ceph.repo (100%)
rename continuousintegration/docker/{ctafrontend => }/alma9/etc/yum.repos.d/cta-ci.repo (100%)
rename continuousintegration/docker/{ctafrontend => }/alma9/etc/yum.repos.d/cta-public-testing.repo (100%)
rename continuousintegration/docker/{ctafrontend => }/alma9/etc/yum.repos.d/eos-citrine-depend.repo (100%)
rename continuousintegration/docker/{ctafrontend => }/alma9/etc/yum.repos.d/xrootd-stable.repo (100%)
rename continuousintegration/docker/{ctafrontend => }/alma9/etc/yum/pluginconf.d/versionlock.list (100%)
rename continuousintegration/docker/{ctafrontend => }/alma9/tag.Dockerfile (92%)
rename continuousintegration/docker/{ctafrontend => }/opt/run/bin/init_pod.sh (100%)
diff --git a/.github/workflows/sonar-source.yml b/.github/workflows/sonar-source.yml
index be605bfca0..af905f336b 100644
--- a/.github/workflows/sonar-source.yml
+++ b/.github/workflows/sonar-source.yml
@@ -42,8 +42,8 @@ jobs:
export CMAKE_OPTIONS
export CTA_VERSION
export CTA_BUILD_ID=${GITHUB_RUN_ID}git${GITHUB_SHA:0:8}
- cp -f continuousintegration/docker/ctafrontend/alma9/etc/yum.repos.d-public/*.repo /etc/yum.repos.d/
- cp -f continuousintegration/docker/ctafrontend/alma9/etc/yum/pluginconf.d/versionlock.list /etc/yum/pluginconf.d/
+ cp -f continuousintegration/docker/alma9/etc/yum.repos.d-public/*.repo /etc/yum.repos.d/
+ cp -f continuousintegration/docker/alma9/etc/yum/pluginconf.d/versionlock.list /etc/yum/pluginconf.d/
if [[ "${GITHUB_REF_TYPE}" == "tag" ]]; then
export TAG_VERSION=$(echo ${GITHUB_REF_NAME} | sed -e 's/^.*v//;s/-.*$//')
export TAG_RELEASE=$(echo ${GITHUB_REF_NAME} | sed -e 's/^.*v[^-]*-//')
diff --git a/.gitlab/ci/build-image.gitlab-ci.yml b/.gitlab/ci/build-image.gitlab-ci.yml
index 30b055d362..353a75c61e 100644
--- a/.gitlab/ci/build-image.gitlab-ci.yml
+++ b/.gitlab/ci/build-image.gitlab-ci.yml
@@ -39,7 +39,7 @@ build-ctageneric-from-artifacts:
- mkdir -p image_rpms
- cp -r build_rpm/RPM/RPMS/x86_64 image_rpms
- /kaniko/executor --context $CI_PROJECT_DIR
- --dockerfile continuousintegration/docker/ctafrontend/alma9/Dockerfile
+ --dockerfile continuousintegration/docker/alma9/Dockerfile
--destination ${CI_REGISTRY}/cta/ctageneric:${CTA_BUILD_ID}
- echo "Image pushed successfully to ${CI_REGISTRY}/cta/ctageneric:${CTA_BUILD_ID}"
@@ -60,7 +60,7 @@ build-ctageneric-from-repos:
- echo "Building image with CTA ${CUSTOM_CTA_TAG} RPMs and EOS ${CUSTOM_EOS_TAG} RPMs"
- echo "Image tag ${CI_REGISTRY}/cta/ctageneric:${CTA_BUILD_ID}"
- /kaniko/executor --context $CI_PROJECT_DIR
- --dockerfile continuousintegration/docker/ctafrontend/alma9/tag.Dockerfile
+ --dockerfile continuousintegration/docker/alma9/tag.Dockerfile
--destination ${CI_REGISTRY}/cta/ctageneric:${CTA_BUILD_ID}
--build-arg "PUBLIC_REPO_VER=${CUSTOM_CTA_TAG:1}"
- echo "Image pushed successfully to ${CI_REGISTRY}/cta/ctageneric:${CTA_BUILD_ID}"
diff --git a/.gitlab/ci/setup.gitlab-ci.yml b/.gitlab/ci/setup.gitlab-ci.yml
index b378dbad25..72e0f0a48e 100644
--- a/.gitlab/ci/setup.gitlab-ci.yml
+++ b/.gitlab/ci/setup.gitlab-ci.yml
@@ -8,7 +8,7 @@ modify-versionlock:
- if: $PIPELINE_TYPE == "EOS_REGR_AGAINST_CTA_TAG"
- if: $PIPELINE_TYPE == "CTAGENERIC_IMAGE"
script:
- - versionlock_path_main="continuousintegration/docker/ctafrontend/alma9/etc/yum/pluginconf.d/"
+ - versionlock_path_main="continuousintegration/docker/alma9/etc/yum/pluginconf.d/"
- versionlock_file="${versionlock_path_main}versionlock.list"
- |
if [ -n "${CUSTOM_CTA_TAG}" ]; then
@@ -54,7 +54,7 @@ modify-versionlock:
fi
artifacts:
paths:
- - continuousintegration/docker/ctafrontend/alma9/etc/yum/pluginconf.d/versionlock.list
+ - continuousintegration/docker/alma9/etc/yum/pluginconf.d/versionlock.list
- cta.spec.in
when: on_success
diff --git a/.gitlab/ci/tests.gitlab-ci.yml b/.gitlab/ci/tests.gitlab-ci.yml
index 14f95e9a1e..8a0cf59868 100644
--- a/.gitlab/ci/tests.gitlab-ci.yml
+++ b/.gitlab/ci/tests.gitlab-ci.yml
@@ -1,7 +1,7 @@
.before-script-alma9: &before-script-alma9
- - cp -f continuousintegration/docker/ctafrontend/alma9/etc/yum.repos.d/*.repo /etc/yum.repos.d/
- - cp -f continuousintegration/docker/ctafrontend/alma9/etc/yum/pluginconf.d/versionlock.list /etc/yum/pluginconf.d/
- - cp -f continuousintegration/docker/ctafrontend/alma9/etc/yum/pluginconf.d/versionlock.list /etc/dnf/plugins/versionlock.list
+ - cp -f continuousintegration/docker/alma9/etc/yum.repos.d/*.repo /etc/yum.repos.d/
+ - cp -f continuousintegration/docker/alma9/etc/yum/pluginconf.d/versionlock.list /etc/yum/pluginconf.d/
+ - cp -f continuousintegration/docker/alma9/etc/yum/pluginconf.d/versionlock.list /etc/dnf/plugins/versionlock.list
- mkdir -p ${CTAREPODIR}
- cp -r build_rpm/RPM ${CTAREPODIR}
- createrepo ${CTAREPODIR}
diff --git a/.gitlab/ci/validation.gitlab-ci.yml b/.gitlab/ci/validation.gitlab-ci.yml
index 8b96da26eb..cdd218f668 100644
--- a/.gitlab/ci/validation.gitlab-ci.yml
+++ b/.gitlab/ci/validation.gitlab-ci.yml
@@ -6,7 +6,7 @@ pipeline-variable-check:
- if: $PIPELINE_TYPE != "COMMIT"
script:
- python3 ./continuousintegration/ci_helpers/ci_input_validate.py
-
+
# If the CTA tagged branch contains a locked EOS version that is different from
# the one in the main branch, then, it is possible that some of the system tests
# fail due to a change in an interface. This failure is expected, but does not
@@ -26,7 +26,7 @@ check-versionlock-diff:
- pipeline-variable-check
script:
- echo "Checking if EOS locked versions match for tag and main."
- - eos_main_v=$(grep -o 'eos-server-[0-9]\+\.[0-9]\+\.[0-9]\+' "continuousintegration/docker/ctafrontend/alma9/etc/yum/pluginconf.d/versionlock.list" | awk -F '-' '{print $3}' | head -1)
+ - eos_main_v=$(grep -o 'eos-server-[0-9]\+\.[0-9]\+\.[0-9]\+' "continuousintegration/docker/alma9/etc/yum/pluginconf.d/versionlock.list" | awk -F '-' '{print $3}' | head -1)
- echo "Locked version for main branch $eos_main_v"
- tag_versionlock_file=$(./continuousintegration/ci_helpers/find_versionlock_list.sh --tag "${CUSTOM_CTA_TAG}")
- git checkout ${CUSTOM_CTA_TAG} -- "${tag_versionlock_file}"
diff --git a/continuousintegration/README.md b/continuousintegration/README.md
index 145346783d..f96c91ed5a 100644
--- a/continuousintegration/README.md
+++ b/continuousintegration/README.md
@@ -15,5 +15,5 @@ $ ./update_repos.sh
```
2. In the CTA repository, update the yum version lock list with the new EOS version:
```
-/CTA/continuousintegration/docker/ctafrontend/alma9/etc/yum/pluginconf.d/versionlock.list
+/CTA/continuousintegration/docker/alma9/etc/yum/pluginconf.d/versionlock.list
```
diff --git a/continuousintegration/ci_helpers/build_rpm.sh b/continuousintegration/ci_helpers/build_rpm.sh
index 748caa3869..e22a661ed4 100755
--- a/continuousintegration/ci_helpers/build_rpm.sh
+++ b/continuousintegration/ci_helpers/build_rpm.sh
@@ -257,8 +257,8 @@ build_rpm() {
if [ "$(grep -c 'AlmaLinux release 9' /etc/redhat-release)" -eq 1 ]; then
# Alma9
echo "Found Alma 9 install..."
- cp -f continuousintegration/docker/ctafrontend/alma9/etc/yum.repos.d/*.repo /etc/yum.repos.d/
- cp -f continuousintegration/docker/ctafrontend/alma9/etc/yum/pluginconf.d/versionlock.list /etc/yum/pluginconf.d/
+ cp -f continuousintegration/docker/alma9/etc/yum.repos.d/*.repo /etc/yum.repos.d/
+ cp -f continuousintegration/docker/alma9/etc/yum/pluginconf.d/versionlock.list /etc/yum/pluginconf.d/
yum -y install epel-release almalinux-release-devel python3-dnf-plugin-versionlock
yum -y install gcc gcc-c++ cmake3 rpm-build yum-utils pandoc which
case "${build_generator}" in
@@ -283,8 +283,8 @@ build_rpm() {
fi
fi
if [ "${install_srpms}" = true ] && [ "${install}" = false ]; then
- cp -f continuousintegration/docker/ctafrontend/alma9/etc/yum.repos.d/*.repo /etc/yum.repos.d/
- cp -f continuousintegration/docker/ctafrontend/alma9/etc/yum/pluginconf.d/versionlock.list /etc/yum/pluginconf.d/
+ cp -f continuousintegration/docker/alma9/etc/yum.repos.d/*.repo /etc/yum.repos.d/
+ cp -f continuousintegration/docker/alma9/etc/yum/pluginconf.d/versionlock.list /etc/yum/pluginconf.d/
yum clean all
yum-builddep --nogpgcheck -y "${srpm_dir}"/*
fi
diff --git a/continuousintegration/ci_helpers/find_versionlock_list.sh b/continuousintegration/ci_helpers/find_versionlock_list.sh
index 10752f06f4..4dec6ff287 100755
--- a/continuousintegration/ci_helpers/find_versionlock_list.sh
+++ b/continuousintegration/ci_helpers/find_versionlock_list.sh
@@ -51,11 +51,11 @@ working_branch=$(git branch --show-current)
git checkout tags/"${tag}" --quiet
# Should match for version >= 5.11.1.0-1
-if [ -d "continuousintegration/docker/ctafrontend/alma9/etc/yum/pluginconf.d/" ]; then
- echo "continuousintegration/docker/ctafrontend/alma9/etc/yum/pluginconf.d/versionlock.list"
+if [ -d "continuousintegration/docker/alma9/etc/yum/pluginconf.d/" ]; then
+ echo "continuousintegration/docker/alma9/etc/yum/pluginconf.d/versionlock.list"
# should match for versions <= 5.11.0.1-1
-elif [ -d "continuousintegration/docker/ctafrontend/alma9/yum/pluginconf.d" ]; then
- echo "continuousintegration/docker/ctafrontend/alma9/yum/pluginconf.d/versionlock.list"
+elif [ -d "continuousintegration/docker/alma9/yum/pluginconf.d" ]; then
+ echo "continuousintegration/docker/alma9/yum/pluginconf.d/versionlock.list"
else
die "ERROR: Could not find the version lock list."
fi
diff --git a/continuousintegration/ci_runner/build_image.sh b/continuousintegration/ci_runner/build_image.sh
index 4cc8ef597b..26e661ac9a 100755
--- a/continuousintegration/ci_runner/build_image.sh
+++ b/continuousintegration/ci_runner/build_image.sh
@@ -44,9 +44,9 @@ buildImage() {
local image_name="ctageneric"
local operating_system=""
local rpm_default_src="image_rpms"
- local yum_repos_dir="continuousintegration/docker/ctafrontend/alma9/etc/yum.repos.d/"
- local yum_versionlock_file="continuousintegration/docker/ctafrontend/alma9/etc/yum/pluginconf.d/versionlock.list"
- local dockerfile="continuousintegration/docker/ctafrontend/alma9/Dockerfile"
+ local yum_repos_dir="continuousintegration/docker/alma9/etc/yum.repos.d/"
+ local yum_versionlock_file="continuousintegration/docker/alma9/etc/yum/pluginconf.d/versionlock.list"
+ local dockerfile="continuousintegration/docker/alma9/Dockerfile"
local load_into_minikube=false
while [[ "$#" -gt 0 ]]; do
diff --git a/continuousintegration/docker/ctafrontend/alma9/Dockerfile b/continuousintegration/docker/alma9/Dockerfile
similarity index 90%
rename from continuousintegration/docker/ctafrontend/alma9/Dockerfile
rename to continuousintegration/docker/alma9/Dockerfile
index da1d29dbf3..1fab989ff5 100644
--- a/continuousintegration/docker/ctafrontend/alma9/Dockerfile
+++ b/continuousintegration/docker/alma9/Dockerfile
@@ -16,15 +16,15 @@
# CTA generic image containing all CTA RPMs
FROM gitlab-registry.cern.ch/linuxsupport/alma9-base
-ENV BASEDIR="continuousintegration/docker/ctafrontend/alma9" \
+ENV BASEDIR="continuousintegration/docker/alma9" \
CTAREPODIR="/opt/repo"
# Add orchestration run scripts locally
COPY ${BASEDIR}/../opt /opt
# Custom Yum repo setup
-ARG YUM_REPOS_DIR=continuousintegration/docker/ctafrontend/alma9/etc/yum.repos.d/
-ARG YUM_VERSIONLOCK_FILE=continuousintegration/docker/ctafrontend/alma9/etc/yum/pluginconf.d/versionlock.list
+ARG YUM_REPOS_DIR=continuousintegration/docker/alma9/etc/yum.repos.d/
+ARG YUM_VERSIONLOCK_FILE=continuousintegration/docker/alma9/etc/yum/pluginconf.d/versionlock.list
COPY ${YUM_REPOS_DIR} /etc/yum.repos.d/
COPY ${YUM_VERSIONLOCK_FILE} /etc/dnf/plugins/versionlock.list
diff --git a/continuousintegration/docker/ctafrontend/alma9/etc/yum.repos.d-public/ceph.repo b/continuousintegration/docker/alma9/etc/yum.repos.d-public/ceph.repo
similarity index 100%
rename from continuousintegration/docker/ctafrontend/alma9/etc/yum.repos.d-public/ceph.repo
rename to continuousintegration/docker/alma9/etc/yum.repos.d-public/ceph.repo
diff --git a/continuousintegration/docker/ctafrontend/alma9/etc/yum.repos.d-public/eos-citrine-depend.repo b/continuousintegration/docker/alma9/etc/yum.repos.d-public/eos-citrine-depend.repo
similarity index 100%
rename from continuousintegration/docker/ctafrontend/alma9/etc/yum.repos.d-public/eos-citrine-depend.repo
rename to continuousintegration/docker/alma9/etc/yum.repos.d-public/eos-citrine-depend.repo
diff --git a/continuousintegration/docker/ctafrontend/alma9/etc/yum.repos.d-public/oracle-instant-client.repo b/continuousintegration/docker/alma9/etc/yum.repos.d-public/oracle-instant-client.repo
similarity index 100%
rename from continuousintegration/docker/ctafrontend/alma9/etc/yum.repos.d-public/oracle-instant-client.repo
rename to continuousintegration/docker/alma9/etc/yum.repos.d-public/oracle-instant-client.repo
diff --git a/continuousintegration/docker/ctafrontend/alma9/etc/yum.repos.d-public/xrootd-stable.repo b/continuousintegration/docker/alma9/etc/yum.repos.d-public/xrootd-stable.repo
similarity index 100%
rename from continuousintegration/docker/ctafrontend/alma9/etc/yum.repos.d-public/xrootd-stable.repo
rename to continuousintegration/docker/alma9/etc/yum.repos.d-public/xrootd-stable.repo
diff --git a/continuousintegration/docker/ctafrontend/alma9/etc/yum.repos.d/ceph.repo b/continuousintegration/docker/alma9/etc/yum.repos.d/ceph.repo
similarity index 100%
rename from continuousintegration/docker/ctafrontend/alma9/etc/yum.repos.d/ceph.repo
rename to continuousintegration/docker/alma9/etc/yum.repos.d/ceph.repo
diff --git a/continuousintegration/docker/ctafrontend/alma9/etc/yum.repos.d/cta-ci.repo b/continuousintegration/docker/alma9/etc/yum.repos.d/cta-ci.repo
similarity index 100%
rename from continuousintegration/docker/ctafrontend/alma9/etc/yum.repos.d/cta-ci.repo
rename to continuousintegration/docker/alma9/etc/yum.repos.d/cta-ci.repo
diff --git a/continuousintegration/docker/ctafrontend/alma9/etc/yum.repos.d/cta-public-testing.repo b/continuousintegration/docker/alma9/etc/yum.repos.d/cta-public-testing.repo
similarity index 100%
rename from continuousintegration/docker/ctafrontend/alma9/etc/yum.repos.d/cta-public-testing.repo
rename to continuousintegration/docker/alma9/etc/yum.repos.d/cta-public-testing.repo
diff --git a/continuousintegration/docker/ctafrontend/alma9/etc/yum.repos.d/eos-citrine-depend.repo b/continuousintegration/docker/alma9/etc/yum.repos.d/eos-citrine-depend.repo
similarity index 100%
rename from continuousintegration/docker/ctafrontend/alma9/etc/yum.repos.d/eos-citrine-depend.repo
rename to continuousintegration/docker/alma9/etc/yum.repos.d/eos-citrine-depend.repo
diff --git a/continuousintegration/docker/ctafrontend/alma9/etc/yum.repos.d/xrootd-stable.repo b/continuousintegration/docker/alma9/etc/yum.repos.d/xrootd-stable.repo
similarity index 100%
rename from continuousintegration/docker/ctafrontend/alma9/etc/yum.repos.d/xrootd-stable.repo
rename to continuousintegration/docker/alma9/etc/yum.repos.d/xrootd-stable.repo
diff --git a/continuousintegration/docker/ctafrontend/alma9/etc/yum/pluginconf.d/versionlock.list b/continuousintegration/docker/alma9/etc/yum/pluginconf.d/versionlock.list
similarity index 100%
rename from continuousintegration/docker/ctafrontend/alma9/etc/yum/pluginconf.d/versionlock.list
rename to continuousintegration/docker/alma9/etc/yum/pluginconf.d/versionlock.list
diff --git a/continuousintegration/docker/ctafrontend/alma9/tag.Dockerfile b/continuousintegration/docker/alma9/tag.Dockerfile
similarity index 92%
rename from continuousintegration/docker/ctafrontend/alma9/tag.Dockerfile
rename to continuousintegration/docker/alma9/tag.Dockerfile
index f24208e6c3..4202876516 100644
--- a/continuousintegration/docker/ctafrontend/alma9/tag.Dockerfile
+++ b/continuousintegration/docker/alma9/tag.Dockerfile
@@ -16,7 +16,7 @@
# CTA generic image containing all CTA RPMs
FROM gitlab-registry.cern.ch/linuxsupport/alma9-base
-ENV BASEDIR="continuousintegration/docker/ctafrontend/alma9" \
+ENV BASEDIR="continuousintegration/docker/alma9" \
CTAREPODIR="/opt/repo"
# Add orchestration run scripts locally
@@ -27,7 +27,7 @@ COPY ${BASEDIR}/etc/yum.repos.d/ /etc/yum.repos.d/
# Variable to specify the tag to be used for CTA RPMs from the cta-ci-repo
# Format: X.YY.ZZ.A-B
ARG PUBLIC_REPO_VER
-ARG YUM_VERSIONLOCK_FILE=continuousintegration/docker/ctafrontend/alma9/etc/yum/pluginconf.d/versionlock.list
+ARG YUM_VERSIONLOCK_FILE=continuousintegration/docker/alma9/etc/yum/pluginconf.d/versionlock.list
# Install necessary packages
diff --git a/continuousintegration/docker/ctafrontend/opt/run/bin/init_pod.sh b/continuousintegration/docker/opt/run/bin/init_pod.sh
similarity index 100%
rename from continuousintegration/docker/ctafrontend/opt/run/bin/init_pod.sh
rename to continuousintegration/docker/opt/run/bin/init_pod.sh
diff --git a/continuousintegration/orchestration/tests/README_restore_files.md b/continuousintegration/orchestration/tests/README_restore_files.md
index 4fb3a792b5..1031c156c6 100644
--- a/continuousintegration/orchestration/tests/README_restore_files.md
+++ b/continuousintegration/orchestration/tests/README_restore_files.md
@@ -1,13 +1,13 @@
# Restore Files Unit Test
The test checks if the restore tool restores a deleted file from the recycle bin. The steps are:
-- Creates a new file
+- Creates a new file
- Deletes the file
-- Restores the file
-- Checks consistency: archive id, checksum and file size for deleted and restored file
+- Restores the file
+- Checks consistency: archive id, checksum and file size for deleted and restored file
- Checks consistency: fxid for restored file in EOS and CTA
## How to Run Test
-The test can be run with the following command:
+The test can be run with the following command:
`./restore_files.sh -n <kubernetes-instance>`
@@ -17,11 +17,11 @@ In addition, the tool must be run from the folder:
There must also be a keytab file provided in `/etc/cta/eos.grpc.keytab`. Use the same token as on the eos side. The file should be on the form:
-```
+```
# disk instance endpoint (host:port) gRPC token
eosdev <eoshostname>.cern.ch:50051 <token>
```
-In `continuousintegration/docker/ctafrontend/alma9/etc/cta/cta-frontend-xrootd.conf` an option should specify the path to the file:
+In `continuousintegration/docker/alma9/etc/cta/cta-frontend-xrootd.conf` an option should specify the path to the file:
-`cta.ns.config /etc/cta/eos.grpc.keytab`
\ No newline at end of file
+`cta.ns.config /etc/cta/eos.grpc.keytab`
diff --git a/continuousintegration/orchestration/tests/test_liquibase_update.sh b/continuousintegration/orchestration/tests/test_liquibase_update.sh
index b1efafb060..f5b800db00 100755
--- a/continuousintegration/orchestration/tests/test_liquibase_update.sh
+++ b/continuousintegration/orchestration/tests/test_liquibase_update.sh
@@ -75,7 +75,7 @@ check_schema_version ${prev_catalogue_schema_version}
# This is pretty disgusting but for now this will do
# If the configmap generation would be done through Helm the file in question needs to be within the chart
-yum_repos_file="$(realpath "$(dirname "$0")/../../docker/ctafrontend/alma9/etc/yum.repos.d")"
+yum_repos_file="$(realpath "$(dirname "$0")/../../docker/alma9/etc/yum.repos.d")"
kubectl -n ${NAMESPACE} create configmap yum.repos.d-config --from-file=${yum_repos_file}
# Set up the catalogue updater pod
diff --git a/cta-release/CMakeLists.txt b/cta-release/CMakeLists.txt
index a19912ff22..537b4d2a13 100644
--- a/cta-release/CMakeLists.txt
+++ b/cta-release/CMakeLists.txt
@@ -76,11 +76,11 @@ foreach(PNAME ${RESULTS})
string(APPEND CTAVERSIONLOCK "${PNAME}-${CTA_VERSION}-${CTA_RELEASE}.${RPMTools_RPMBUILD_DIST}.*\n")
endforeach()
-file(READ ../continuousintegration/docker/ctafrontend/${OS}/etc/yum/pluginconf.d/versionlock.list VERSIONLOCK)
+file(READ ../continuousintegration/docker/${OS}/etc/yum/pluginconf.d/versionlock.list VERSIONLOCK)
# Repos files
file (GLOB REPO_FILES
- "${CMAKE_SOURCE_DIR}/continuousintegration/docker/ctafrontend/${OS}/etc/yum.repos.d-public/*.repo"
+ "${CMAKE_SOURCE_DIR}/continuousintegration/docker/${OS}/etc/yum.repos.d-public/*.repo"
)
string(APPEND CTAVERSIONLOCK "${VERSIONLOCK}")
--
GitLab