Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tests: Fix the spec URL value #2036

Merged
merged 4 commits into from
Oct 9, 2024
Merged

tests: Fix the spec URL value #2036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62c2196
tests: Fix the spec URL value
martin-g Oct 1, 2024
a82aeb4
Add get_source.sh for admin/test-suite component
martin-g Oct 4, 2024
9586911
Add Perl File::Copy & File::Compare as build requirements
martin-g Oct 4, 2024
6b98e93
docs & test-suite: shellcheck lint the get_source.sh scripts
martin-g Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions components/admin/docs/SOURCES/get_source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,34 @@
#!/usr/bin/env bash

set -x
set -xe

# Note: The current working directory is the component's SPEC folder
OHPC_ROOT_FOLDER="../../../.."

# The folder that will contain the .git/ and docs/ folders
DOCS_OHPC_FOLDER=docs-ohpc
DOCS_OHPC_FOLDER="docs-ohpc"

cleanup() {
rm -rf ${DOCS_OHPC_FOLDER}
find ${OHPC_ROOT_FOLDER}/docs/recipes/install/ -name "vc.tex" -delete
rm -rf "${DOCS_OHPC_FOLDER}"
find "${OHPC_ROOT_FOLDER}/docs/recipes/install/" -name "vc.tex" -delete
}
trap cleanup EXIT

# 1. Prepare
cleanup
mkdir -p ${DOCS_OHPC_FOLDER}
mkdir -p "${DOCS_OHPC_FOLDER}"

# 2. Copy the Git metadata
cp -r ${OHPC_ROOT_FOLDER}/.git ${DOCS_OHPC_FOLDER}
cp -r "${OHPC_ROOT_FOLDER}/.git" "${DOCS_OHPC_FOLDER}"

# 3. Copy the local docs/
cp -r ${OHPC_ROOT_FOLDER}/docs ${DOCS_OHPC_FOLDER}
cp -r "${OHPC_ROOT_FOLDER}/docs" "${DOCS_OHPC_FOLDER}"

# 4. Add dummy vc.tex to the docs
for makefile in `find ${DOCS_OHPC_FOLDER}/docs/recipes/install/ -name "Makefile"`; do
folder=$(dirname ${makefile})
cat <<'EOF' > ${folder}/vc.tex
find "${DOCS_OHPC_FOLDER}"/docs/recipes/install/ -name "Makefile" -print0 | while IFS= read -r -d '' makefile
do
folder=$(dirname "${makefile}")
cat <<'EOF' > "${folder}"/vc.tex
%%% Define Git specific macros.
\gdef\GITHash{5ffbf3e2ed0ed558c1ae5672f7e5023298b7c2a9}%
\gdef\GITAbrHash{5ffbf3e}%
Expand Down Expand Up @@ -55,4 +56,4 @@ EOF
done

# 5. Create docs-ohpc.tar
tar cf ../SOURCES/docs-ohpc.tar ${DOCS_OHPC_FOLDER}
tar cf ../SOURCES/docs-ohpc.tar "${DOCS_OHPC_FOLDER}"
24 changes: 24 additions & 0 deletions components/admin/test-suite/SOURCES/get_source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/usr/bin/env bash

set -xe

# Note: The current working directory is the component's SPEC folder
OHPC_ROOT_FOLDER="../../../.."

# The folder that will contain the .git/ and docs/ folders
TESTS_OHPC_FOLDER=tests-ohpc

cleanup() {
rm -rf "${TESTS_OHPC_FOLDER}"
}
trap cleanup EXIT

# 1. Prepare
cleanup
mkdir -p "${TESTS_OHPC_FOLDER}"

# 2. Copy the local docs/
cp -r "${OHPC_ROOT_FOLDER}/tests" "${TESTS_OHPC_FOLDER}"

# 3. Create tests-ohpc.tar
tar cf ../SOURCES/tests-ohpc.tar "${TESTS_OHPC_FOLDER}"
4 changes: 3 additions & 1 deletion components/admin/test-suite/SPECS/tests.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ Release: 1
License: Apache-2.0
Group: %{PROJ_NAME}/admin
BuildArch: noarch
URL: https://github.com/openhpc/ohpc/tests
URL: https://github.com/openhpc/ohpc
Source0: tests-ohpc.tar

BuildRequires: perl(File::Copy)
BuildRequires: perl(File::Compare)
BuildRequires: autoconf%{PROJ_DELIM}
BuildRequires: automake%{PROJ_DELIM}

Expand Down
2 changes: 2 additions & 0 deletions tests/ci/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ shellcheck-lint:
../../components/OHPC_setup_compiler \
../../components/OHPC_setup_mpi \
../../components/admin/prun/SOURCES/prun \
../../components/admin/docs/SOURCES/get_source.sh \
../../components/admin/test-suite/SOURCES/get_source.sh \
../../components/rms/slurm/SOURCES/slurm.epilog.clean \
../../tests/libs/netcdf/ohpc-tests/netcdf_all_test_mpi_families \
../../tests/libs/netcdf/ohpc-tests/test_mpi_families
Expand Down
Loading