From 0abf67a338506cc263773e3628f7a9edca366a2c Mon Sep 17 00:00:00 2001 From: jbabazadeh Date: Sun, 7 Sep 2025 21:11:17 +0300 Subject: [PATCH 01/12] add privatepacks --- content-repo/create-docs.sh | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/content-repo/create-docs.sh b/content-repo/create-docs.sh index 8d7d6b883..bfb1140be 100755 --- a/content-repo/create-docs.sh +++ b/content-repo/create-docs.sh @@ -86,6 +86,36 @@ echo "Content git dir [${CONTENT_GIT_DIR}] size: $(du -sh ${CONTENT_GIT_DIR})" cd ${SCRIPT_DIR} +# Get the script directory (absolute path) +SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) + +# Path where GitLab stored content-test-conf artifacts +CONTENT_TEST_CONF_DIR="/builds/xdr/cortex-content/content-docs/artifacts/repositories/content-test-conf" + +if [ -d "${CONTENT_TEST_CONF_DIR}" ]; then + echo "Syncing private packs into existing content packs..." + + PRIVATE_PACKS_DIR="${CONTENT_TEST_CONF_DIR}/private-packs" + CONTENT_PACKS_DIR="${CONTENT_GIT_DIR}/Packs" + + for pack in "${PRIVATE_PACKS_DIR}"/*; do + pack_name=$(basename "$pack") + target_pack="${CONTENT_PACKS_DIR}/${pack_name}" + + if [ -d "$target_pack" ]; then + echo "Pack ${pack_name} exists in content. Copying files..." + # Copy files into existing pack without overwriting existing ones + rsync -av --ignore-existing "${pack}/" "${target_pack}/" + else + echo "Pack ${pack_name} does not exist in content. Skipping." + fi + done + + echo "Finished syncing packs." +else + echo "content-test-conf directory not found at ${CONTENT_TEST_CONF_DIR}, skipping pack sync." +fi + if [[ ( "$PULL_REQUEST" == "true" || -n "$CI_PULL_REQUEST" ) && "$CONTENT_BRANCH" == "master" ]]; then echo "Checking if only doc files where modified and we can do a limited preview build..." if [ -n "$CIRCLE_COMPARE_URL" ]; then From e63751c59bab082b99c87537ac1ea1fa7e8af03a Mon Sep 17 00:00:00 2001 From: jbabazadeh Date: Sun, 7 Sep 2025 21:21:43 +0300 Subject: [PATCH 02/12] add privatepacks --- content-repo/create-docs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content-repo/create-docs.sh b/content-repo/create-docs.sh index bfb1140be..55d0383c3 100755 --- a/content-repo/create-docs.sh +++ b/content-repo/create-docs.sh @@ -95,7 +95,7 @@ CONTENT_TEST_CONF_DIR="/builds/xdr/cortex-content/content-docs/artifacts/reposit if [ -d "${CONTENT_TEST_CONF_DIR}" ]; then echo "Syncing private packs into existing content packs..." - PRIVATE_PACKS_DIR="${CONTENT_TEST_CONF_DIR}/private-packs" + PRIVATE_PACKS_DIR="${CONTENT_TEST_CONF_DIR}/content/private-packs" CONTENT_PACKS_DIR="${CONTENT_GIT_DIR}/Packs" for pack in "${PRIVATE_PACKS_DIR}"/*; do From 255fa6b00c68a8cc4b0ad19f232f9048b76fcb6f Mon Sep 17 00:00:00 2001 From: jbabazadeh Date: Sun, 7 Sep 2025 21:23:08 +0300 Subject: [PATCH 03/12] add privatepacks --- content-repo/create-docs.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/content-repo/create-docs.sh b/content-repo/create-docs.sh index 55d0383c3..1bc3ea6e3 100755 --- a/content-repo/create-docs.sh +++ b/content-repo/create-docs.sh @@ -100,6 +100,7 @@ if [ -d "${CONTENT_TEST_CONF_DIR}" ]; then for pack in "${PRIVATE_PACKS_DIR}"/*; do pack_name=$(basename "$pack") + echo "Processing pack: ${pack_name}" target_pack="${CONTENT_PACKS_DIR}/${pack_name}" if [ -d "$target_pack" ]; then From 2a99f179ef4557d22495c5f3846ecd433f79392e Mon Sep 17 00:00:00 2001 From: jbabazadeh Date: Sun, 7 Sep 2025 21:47:39 +0300 Subject: [PATCH 04/12] add privatepacks --- content-repo/create-docs.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/content-repo/create-docs.sh b/content-repo/create-docs.sh index 1bc3ea6e3..70f2f41aa 100755 --- a/content-repo/create-docs.sh +++ b/content-repo/create-docs.sh @@ -98,6 +98,9 @@ if [ -d "${CONTENT_TEST_CONF_DIR}" ]; then PRIVATE_PACKS_DIR="${CONTENT_TEST_CONF_DIR}/content/private-packs" CONTENT_PACKS_DIR="${CONTENT_GIT_DIR}/Packs" + + ls -l "$PRIVATE_PACKS_DIR" + for pack in "${PRIVATE_PACKS_DIR}"/*; do pack_name=$(basename "$pack") echo "Processing pack: ${pack_name}" From 99da882c11544e06c8eb2c0712a87fba8a589b4f Mon Sep 17 00:00:00 2001 From: jbabazadeh Date: Sun, 7 Sep 2025 21:53:11 +0300 Subject: [PATCH 05/12] add privatepacks --- content-repo/create-docs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content-repo/create-docs.sh b/content-repo/create-docs.sh index 70f2f41aa..b7181f667 100755 --- a/content-repo/create-docs.sh +++ b/content-repo/create-docs.sh @@ -94,8 +94,8 @@ CONTENT_TEST_CONF_DIR="/builds/xdr/cortex-content/content-docs/artifacts/reposit if [ -d "${CONTENT_TEST_CONF_DIR}" ]; then echo "Syncing private packs into existing content packs..." - - PRIVATE_PACKS_DIR="${CONTENT_TEST_CONF_DIR}/content/private-packs" + + PRIVATE_PACKS_DIR="${CONTENT_TEST_CONF_DIR}/content/PrivatePacks" CONTENT_PACKS_DIR="${CONTENT_GIT_DIR}/Packs" From 16e53889f757a121716f9518600dc0ec20cab547 Mon Sep 17 00:00:00 2001 From: jbabazadeh Date: Sun, 7 Sep 2025 22:02:49 +0300 Subject: [PATCH 06/12] add privatepacks --- content-repo/create-docs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content-repo/create-docs.sh b/content-repo/create-docs.sh index b7181f667..6b9292280 100755 --- a/content-repo/create-docs.sh +++ b/content-repo/create-docs.sh @@ -94,7 +94,7 @@ CONTENT_TEST_CONF_DIR="/builds/xdr/cortex-content/content-docs/artifacts/reposit if [ -d "${CONTENT_TEST_CONF_DIR}" ]; then echo "Syncing private packs into existing content packs..." - + PRIVATE_PACKS_DIR="${CONTENT_TEST_CONF_DIR}/content/PrivatePacks" CONTENT_PACKS_DIR="${CONTENT_GIT_DIR}/Packs" @@ -109,7 +109,7 @@ if [ -d "${CONTENT_TEST_CONF_DIR}" ]; then if [ -d "$target_pack" ]; then echo "Pack ${pack_name} exists in content. Copying files..." # Copy files into existing pack without overwriting existing ones - rsync -av --ignore-existing "${pack}/" "${target_pack}/" + cp -rn "$pack/" "$target_pack/" else echo "Pack ${pack_name} does not exist in content. Skipping." fi From ddc79dcca7e7bd238bf956a1f4debe5fd3475ecb Mon Sep 17 00:00:00 2001 From: jbabazadeh Date: Sun, 7 Sep 2025 22:18:03 +0300 Subject: [PATCH 07/12] add privatepacks --- content-repo/create-docs.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/content-repo/create-docs.sh b/content-repo/create-docs.sh index 6b9292280..da49e0977 100755 --- a/content-repo/create-docs.sh +++ b/content-repo/create-docs.sh @@ -110,6 +110,7 @@ if [ -d "${CONTENT_TEST_CONF_DIR}" ]; then echo "Pack ${pack_name} exists in content. Copying files..." # Copy files into existing pack without overwriting existing ones cp -rn "$pack/" "$target_pack/" + ls -l "$target_pack" else echo "Pack ${pack_name} does not exist in content. Skipping." fi From 26c2f7916bea4d0285f29f43966ec09575d3e784 Mon Sep 17 00:00:00 2001 From: jbabazadeh Date: Sun, 7 Sep 2025 22:18:18 +0300 Subject: [PATCH 08/12] add privatepacks --- content-repo/create-docs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content-repo/create-docs.sh b/content-repo/create-docs.sh index da49e0977..a8e6a8000 100755 --- a/content-repo/create-docs.sh +++ b/content-repo/create-docs.sh @@ -99,7 +99,7 @@ if [ -d "${CONTENT_TEST_CONF_DIR}" ]; then CONTENT_PACKS_DIR="${CONTENT_GIT_DIR}/Packs" - ls -l "$PRIVATE_PACKS_DIR" + # ls -l "$PRIVATE_PACKS_DIR" for pack in "${PRIVATE_PACKS_DIR}"/*; do pack_name=$(basename "$pack") From 441e797f24342b19328ab1e47874951c76e0d094 Mon Sep 17 00:00:00 2001 From: jbabazadeh Date: Sun, 7 Sep 2025 22:44:09 +0300 Subject: [PATCH 09/12] add privatepacks --- content-repo/create-docs.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content-repo/create-docs.sh b/content-repo/create-docs.sh index a8e6a8000..091757831 100755 --- a/content-repo/create-docs.sh +++ b/content-repo/create-docs.sh @@ -104,10 +104,12 @@ if [ -d "${CONTENT_TEST_CONF_DIR}" ]; then for pack in "${PRIVATE_PACKS_DIR}"/*; do pack_name=$(basename "$pack") echo "Processing pack: ${pack_name}" + ls -l "$pack" target_pack="${CONTENT_PACKS_DIR}/${pack_name}" if [ -d "$target_pack" ]; then echo "Pack ${pack_name} exists in content. Copying files..." + ls -l "$target_pack" # Copy files into existing pack without overwriting existing ones cp -rn "$pack/" "$target_pack/" ls -l "$target_pack" From fdde8446d91bf8b69ff8b7d31eef5aa393c26932 Mon Sep 17 00:00:00 2001 From: jbabazadeh Date: Sun, 7 Sep 2025 23:00:49 +0300 Subject: [PATCH 10/12] add privatepacks --- content-repo/create-docs.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/content-repo/create-docs.sh b/content-repo/create-docs.sh index 091757831..a22cb9678 100755 --- a/content-repo/create-docs.sh +++ b/content-repo/create-docs.sh @@ -104,14 +104,12 @@ if [ -d "${CONTENT_TEST_CONF_DIR}" ]; then for pack in "${PRIVATE_PACKS_DIR}"/*; do pack_name=$(basename "$pack") echo "Processing pack: ${pack_name}" - ls -l "$pack" target_pack="${CONTENT_PACKS_DIR}/${pack_name}" if [ -d "$target_pack" ]; then echo "Pack ${pack_name} exists in content. Copying files..." - ls -l "$target_pack" # Copy files into existing pack without overwriting existing ones - cp -rn "$pack/" "$target_pack/" + cp -rn "$pack/"* "$target_pack/" ls -l "$target_pack" else echo "Pack ${pack_name} does not exist in content. Skipping." From 27da27c6616e6890aadf32d9267fec4a823f2a68 Mon Sep 17 00:00:00 2001 From: jbabazadeh Date: Wed, 10 Sep 2025 15:43:41 +0300 Subject: [PATCH 11/12] remove comments --- content-repo/create-docs.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/content-repo/create-docs.sh b/content-repo/create-docs.sh index a22cb9678..ff2cb0600 100755 --- a/content-repo/create-docs.sh +++ b/content-repo/create-docs.sh @@ -88,7 +88,7 @@ cd ${SCRIPT_DIR} # Get the script directory (absolute path) SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) - +echo "dir - ${SCRIPT_DIR}" # Path where GitLab stored content-test-conf artifacts CONTENT_TEST_CONF_DIR="/builds/xdr/cortex-content/content-docs/artifacts/repositories/content-test-conf" @@ -98,9 +98,6 @@ if [ -d "${CONTENT_TEST_CONF_DIR}" ]; then PRIVATE_PACKS_DIR="${CONTENT_TEST_CONF_DIR}/content/PrivatePacks" CONTENT_PACKS_DIR="${CONTENT_GIT_DIR}/Packs" - - # ls -l "$PRIVATE_PACKS_DIR" - for pack in "${PRIVATE_PACKS_DIR}"/*; do pack_name=$(basename "$pack") echo "Processing pack: ${pack_name}" @@ -110,7 +107,6 @@ if [ -d "${CONTENT_TEST_CONF_DIR}" ]; then echo "Pack ${pack_name} exists in content. Copying files..." # Copy files into existing pack without overwriting existing ones cp -rn "$pack/"* "$target_pack/" - ls -l "$target_pack" else echo "Pack ${pack_name} does not exist in content. Skipping." fi From 80e6967021693af00114f207fe3416e8b7c068fc Mon Sep 17 00:00:00 2001 From: jbabazadeh Date: Wed, 10 Sep 2025 19:09:06 +0300 Subject: [PATCH 12/12] fixed --- content-repo/create-docs.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/content-repo/create-docs.sh b/content-repo/create-docs.sh index ff2cb0600..0ec62a00a 100755 --- a/content-repo/create-docs.sh +++ b/content-repo/create-docs.sh @@ -86,9 +86,6 @@ echo "Content git dir [${CONTENT_GIT_DIR}] size: $(du -sh ${CONTENT_GIT_DIR})" cd ${SCRIPT_DIR} -# Get the script directory (absolute path) -SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) -echo "dir - ${SCRIPT_DIR}" # Path where GitLab stored content-test-conf artifacts CONTENT_TEST_CONF_DIR="/builds/xdr/cortex-content/content-docs/artifacts/repositories/content-test-conf"