From 7d66da6c3becad1c45a74d4912c5e7e54e99d38d Mon Sep 17 00:00:00 2001 From: JeGoi <13801368+JeGoi@users.noreply.github.com> Date: Tue, 5 Nov 2024 11:09:47 -0500 Subject: [PATCH] Fix/8280 Fix the material page update since moving private repo (#8378) * Add artifact and remove pushed to git repo * Change job's name * Extract file from docker container * Fix create directory to extract material.html file --- .gitlab-ci.yml | 8 ++++++-- ci/lib/build/generate-material.sh | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d5399c60a60..4c940c8baa51 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -389,6 +389,10 @@ variables: DST_FILE: layouts/partials/about/material.html script: - ${BUILDDIR}/generate-material.sh + artifacts: + expire_in: 1 day + paths: + - result/material.html tags: - shell @@ -1149,14 +1153,14 @@ build_artifacts_website_release: - .release_only_rules # build_artificats_material job for development -material_devel_and_branches: +build_artifacts_material_devel_and_branches: image: ${PFBUILD_DEB_IMG}:${PFBUILD_DEFAULT_DEV_TAG} extends: - .build_artifacts_material_job - .build_artifacts_material_devel_and_branches_rules # build_artificats_material job for release -material_release: +build_artifacts_material_release: image: ${PFBUILD_DEB_IMG}:${CI_COMMIT_TAG} extends: - .build_artifacts_material_job diff --git a/ci/lib/build/generate-material.sh b/ci/lib/build/generate-material.sh index 3d215385c5fb..ea5d0fbf5073 100755 --- a/ci/lib/build/generate-material.sh +++ b/ci/lib/build/generate-material.sh @@ -38,6 +38,7 @@ generate_material() { make -C ${PF_SRC_DIR} configurations make -C ${PF_SRC_DIR} conf/unified_api_system_pass make -C ${PF_SRC_DIR} conf/local_secret + mkdir -p ${PF_SRC_DIR}/result echo "Starting ${CONTAINER_NAME} container" docker run --detach --name=${CONTAINER_NAME} --rm -e PFCONFIG_PROTO=unix \ @@ -51,6 +52,7 @@ generate_material() { -v ${PF_SRC_DIR}/ci/lib:/usr/local/pf/ci/lib \ -v ${PF_SRC_DIR}/config.mk:/usr/local/pf/config.mk \ -v ${PF_SRC_DIR}/Makefile:/usr/local/pf/Makefile \ + -v ${PF_SRC_DIR}/result:/usr/local/pf/result \ ghcr.io/inverse-inc/packetfence/pfconfig:${IMAGE_TAG} echo "Let some time to container to start" @@ -59,8 +61,8 @@ generate_material() { echo "Generating material.html file" docker exec ${CONTAINER_NAME} /usr/bin/make material - echo "Publishing material.html to git if necessary" - docker exec ${CONTAINER_NAME} /usr/local/pf/ci/lib/release/publish-to-git.sh ${SRC_FILE} ${DST_FILE} + #echo "Publishing material.html to git if necessary" + #docker exec ${CONTAINER_NAME} /usr/local/pf/ci/lib/release/publish-to-git.sh ${SRC_FILE} ${DST_FILE} } cleanup() {