Skip to content

Commit b1e46cb

Browse files
Leonid Borchuktuhaihe
Leonid Borchuk
authored and
tuhaihe
committed
Reorganize files in main repo and add licence info to all files
1 parent fa6f24b commit b1e46cb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+641
-367
lines changed

‎.github/workflows/build-cloudberry.yml‎

Lines changed: 13 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -441,24 +441,6 @@ jobs:
441441
fetch-depth: 1
442442
submodules: true
443443

444-
- name: Checkout CI Build/Test Scripts
445-
if: needs.check-skip.outputs.should_skip != 'true'
446-
uses: actions/checkout@v4
447-
with:
448-
repository: apache/cloudberry-devops-release
449-
ref: main
450-
path: cloudberry-devops-release
451-
fetch-depth: 1
452-
453-
- name: Move cloudberry-devops-release directory
454-
if: needs.check-skip.outputs.should_skip != 'true'
455-
run: |
456-
set -eo pipefail
457-
if ! mv "${GITHUB_WORKSPACE}"/cloudberry-devops-release "${GITHUB_WORKSPACE}"/..; then
458-
echo "::error::Container initialization failed"
459-
exit 1
460-
fi
461-
462444
- name: Cloudberry Environment Initialization
463445
if: needs.check-skip.outputs.should_skip != 'true'
464446
env:
@@ -510,8 +492,8 @@ jobs:
510492
SRC_DIR: ${{ github.workspace }}
511493
run: |
512494
set -eo pipefail
513-
chmod +x "${SRC_DIR}"/../cloudberry-devops-release/build_automation/cloudberry/scripts/configure-cloudberry.sh
514-
if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ENABLE_DEBUG=${{ env.ENABLE_DEBUG }} ${SRC_DIR}/../cloudberry-devops-release/build_automation/cloudberry/scripts/configure-cloudberry.sh"; then
495+
chmod +x "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/configure-cloudberry.sh
496+
if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ENABLE_DEBUG=${{ env.ENABLE_DEBUG }} ${SRC_DIR}/devops/build/automation/cloudberry/scripts/configure-cloudberry.sh"; then
515497
echo "::error::Configure script failed"
516498
exit 1
517499
fi
@@ -523,8 +505,8 @@ jobs:
523505
run: |
524506
set -eo pipefail
525507
526-
chmod +x "${SRC_DIR}"/../cloudberry-devops-release/build_automation/cloudberry/scripts/build-cloudberry.sh
527-
if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ${SRC_DIR}/../cloudberry-devops-release/build_automation/cloudberry/scripts/build-cloudberry.sh"; then
508+
chmod +x "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/build-cloudberry.sh
509+
if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ${SRC_DIR}/devops/build/automation/cloudberry/scripts/build-cloudberry.sh"; then
528510
echo "::error::Build script failed"
529511
exit 1
530512
fi
@@ -606,7 +588,7 @@ jobs:
606588
# Create RPM
607589
echo "Creating RPM package..."
608590
rpmdev-setuptree
609-
ln -s "${SRC_DIR}"/../cloudberry-devops-release/packaging/rpm/el/SPECS/apache-cloudberry-db-incubating.spec "${HOME}"/rpmbuild/SPECS/apache-cloudberry-db-incubating.spec
591+
ln -s "${SRC_DIR}"/devops/build/packaging/rpm/apache-cloudberry-db-incubating.spec "${HOME}"/rpmbuild/SPECS/apache-cloudberry-db-incubating.spec
610592
cp "${SRC_DIR}"/LICENSE /usr/local/cloudberry-db
611593
612594
DEBUG_RPMBUILD_OPT=""
@@ -616,7 +598,7 @@ jobs:
616598
DEBUG_IDENTIFIER=".debug"
617599
fi
618600
619-
"${SRC_DIR}"/../cloudberry-devops-release/scripts/build-rpm.sh --version "${CBDB_VERSION}" --release "${BUILD_NUMBER}" "${DEBUG_RPMBUILD_OPT}"
601+
"${SRC_DIR}"/devops/build/packaging/rpm/build-rpm.sh --version "${CBDB_VERSION}" --release "${BUILD_NUMBER}" "${DEBUG_RPMBUILD_OPT}"
620602
621603
# Get OS version and move RPM
622604
os_version=$(grep -oP '(?<=^VERSION_ID=")[0-9]' /etc/os-release)
@@ -653,8 +635,8 @@ jobs:
653635
SRC_DIR: ${{ github.workspace }}
654636
run: |
655637
set -eo pipefail
656-
chmod +x "${SRC_DIR}"/../cloudberry-devops-release/build_automation/cloudberry/scripts/unittest-cloudberry.sh
657-
if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ${SRC_DIR}/../cloudberry-devops-release/build_automation/cloudberry/scripts/unittest-cloudberry.sh"; then
638+
chmod +x "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/unittest-cloudberry.sh
639+
if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ${SRC_DIR}/devops/build/automation/cloudberry/scripts/unittest-cloudberry.sh"; then
658640
echo "::error::Unittest script failed"
659641
exit 1
660642
fi
@@ -904,24 +886,6 @@ jobs:
904886
run: |
905887
echo "Timestamp from output: ${{ needs.build.outputs.build_timestamp }}"
906888
907-
- name: Checkout CI Build/Test Scripts
908-
if: needs.check-skip.outputs.should_skip != 'true'
909-
uses: actions/checkout@v4
910-
with:
911-
repository: apache/cloudberry-devops-release
912-
ref: main
913-
path: cloudberry-devops-release
914-
fetch-depth: 1
915-
916-
- name: Move cloudberry-devops-release directory
917-
if: needs.check-skip.outputs.should_skip != 'true'
918-
run: |
919-
set -eo pipefail
920-
if ! mv "${GITHUB_WORKSPACE}"/cloudberry-devops-release "${GITHUB_WORKSPACE}"/..; then
921-
echo "::error::Container initialization failed"
922-
exit 1
923-
fi
924-
925889
- name: Cloudberry Environment Initialization
926890
env:
927891
LOGS_DIR: build-logs
@@ -1267,8 +1231,8 @@ jobs:
12671231
set -eo pipefail
12681232
12691233
{
1270-
chmod +x "${SRC_DIR}"/../cloudberry-devops-release/build_automation/cloudberry/scripts/create-cloudberry-demo-cluster.sh
1271-
if ! time su - gpadmin -c "cd ${SRC_DIR} && NUM_PRIMARY_MIRROR_PAIRS='${{ matrix.num_primary_mirror_pairs }}' SRC_DIR=${SRC_DIR} ${SRC_DIR}/../cloudberry-devops-release/build_automation/cloudberry/scripts/create-cloudberry-demo-cluster.sh"; then
1234+
chmod +x "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/create-cloudberry-demo-cluster.sh
1235+
if ! time su - gpadmin -c "cd ${SRC_DIR} && NUM_PRIMARY_MIRROR_PAIRS='${{ matrix.num_primary_mirror_pairs }}' SRC_DIR=${SRC_DIR} ${SRC_DIR}/devops/build/automation/cloudberry/scripts/create-cloudberry-demo-cluster.sh"; then
12721236
echo "::error::Demo cluster creation failed"
12731237
exit 1
12741238
fi
@@ -1343,7 +1307,7 @@ jobs:
13431307
MAKE_DIRECTORY='-C $dir' \
13441308
PGOPTIONS='${PG_OPTS}' \
13451309
SRC_DIR='${SRC_DIR}' \
1346-
${SRC_DIR}/../cloudberry-devops-release/build_automation/cloudberry/scripts/test-cloudberry.sh" \
1310+
${SRC_DIR}/devops/build/automation/cloudberry/scripts/test-cloudberry.sh" \
13471311
2>&1 | tee "$config_log"; then
13481312
echo "::warning::Test execution failed for configuration $((i+1)): make -C $dir $target"
13491313
overall_status=1
@@ -1376,7 +1340,7 @@ jobs:
13761340
ls -Rl "/tmp/cloudberry-cores"
13771341
echo "-----------------------------------------"
13781342
1379-
"${SRC_DIR}"/../cloudberry-devops-release/build_automation/cloudberry/scripts/analyze_core_dumps.sh "$test_id"
1343+
"${SRC_DIR}"/devops/build/automation/cloudberry/scripts/analyze_core_dumps.sh "$test_id"
13801344
core_analysis_rc=$?
13811345
case "$core_analysis_rc" in
13821346
0) echo "No core dumps found for this configuration" ;;
@@ -1452,7 +1416,7 @@ jobs:
14521416
# Parse this configuration's results
14531417
14541418
MAKE_NAME="${{ matrix.test }}-config$i" \
1455-
"${SRC_DIR}"/../cloudberry-devops-release/build_automation/cloudberry/scripts/parse-test-results.sh "$config_log"
1419+
"${SRC_DIR}"/devops/build/automation/cloudberry/scripts/parse-test-results.sh "$config_log"
14561420
status_code=$?
14571421
14581422
{

‎.github/workflows/build-dbg-cloudberry.yml‎

Lines changed: 13 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -343,24 +343,6 @@ jobs:
343343
fetch-depth: 1
344344
submodules: true
345345

346-
- name: Checkout CI Build/Test Scripts
347-
if: needs.check-skip.outputs.should_skip != 'true'
348-
uses: actions/checkout@v4
349-
with:
350-
repository: apache/cloudberry-devops-release
351-
ref: main
352-
path: cloudberry-devops-release
353-
fetch-depth: 1
354-
355-
- name: Move cloudberry-devops-release directory
356-
if: needs.check-skip.outputs.should_skip != 'true'
357-
run: |
358-
set -eo pipefail
359-
if ! mv "${GITHUB_WORKSPACE}"/cloudberry-devops-release "${GITHUB_WORKSPACE}"/..; then
360-
echo "::error::Container initialization failed"
361-
exit 1
362-
fi
363-
364346
- name: Cloudberry Environment Initialization
365347
if: needs.check-skip.outputs.should_skip != 'true'
366348
env:
@@ -412,8 +394,8 @@ jobs:
412394
SRC_DIR: ${{ github.workspace }}
413395
run: |
414396
set -eo pipefail
415-
chmod +x "${SRC_DIR}"/../cloudberry-devops-release/build_automation/cloudberry/scripts/configure-cloudberry.sh
416-
if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ENABLE_DEBUG=${{ env.ENABLE_DEBUG }} ${SRC_DIR}/../cloudberry-devops-release/build_automation/cloudberry/scripts/configure-cloudberry.sh"; then
397+
chmod +x "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/configure-cloudberry.sh
398+
if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ENABLE_DEBUG=${{ env.ENABLE_DEBUG }} ${SRC_DIR}/devops/build/automation/cloudberry/scripts/configure-cloudberry.sh"; then
417399
echo "::error::Configure script failed"
418400
exit 1
419401
fi
@@ -425,8 +407,8 @@ jobs:
425407
run: |
426408
set -eo pipefail
427409
428-
chmod +x "${SRC_DIR}"/../cloudberry-devops-release/build_automation/cloudberry/scripts/build-cloudberry.sh
429-
if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ${SRC_DIR}/../cloudberry-devops-release/build_automation/cloudberry/scripts/build-cloudberry.sh"; then
410+
chmod +x "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/build-cloudberry.sh
411+
if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ${SRC_DIR}/devops/build/automation/cloudberry/scripts/build-cloudberry.sh"; then
430412
echo "::error::Build script failed"
431413
exit 1
432414
fi
@@ -508,7 +490,7 @@ jobs:
508490
# Create RPM
509491
echo "Creating RPM package..."
510492
rpmdev-setuptree
511-
ln -s "${SRC_DIR}"/../cloudberry-devops-release/packaging/rpm/el/SPECS/apache-cloudberry-db-incubating.spec "${HOME}"/rpmbuild/SPECS/apache-cloudberry-db-incubating.spec
493+
ln -s "${SRC_DIR}"/devops/build/packaging/rpm/apache-cloudberry-db-incubating.spec "${HOME}"/rpmbuild/SPECS/apache-cloudberry-db-incubating.spec
512494
cp "${SRC_DIR}"/LICENSE /usr/local/cloudberry-db
513495
514496
DEBUG_RPMBUILD_OPT=""
@@ -518,7 +500,7 @@ jobs:
518500
DEBUG_IDENTIFIER=".debug"
519501
fi
520502
521-
"${SRC_DIR}"/../cloudberry-devops-release/scripts/build-rpm.sh --version "${CBDB_VERSION}" --release "${BUILD_NUMBER}" "${DEBUG_RPMBUILD_OPT}"
503+
"${SRC_DIR}"/devops/build/packaging/rpm/build-rpm.sh --version "${CBDB_VERSION}" --release "${BUILD_NUMBER}" "${DEBUG_RPMBUILD_OPT}"
522504
523505
# Get OS version and move RPM
524506
os_version=$(grep -oP '(?<=^VERSION_ID=")[0-9]' /etc/os-release)
@@ -553,8 +535,8 @@ jobs:
553535
SRC_DIR: ${{ github.workspace }}
554536
run: |
555537
set -eo pipefail
556-
chmod +x "${SRC_DIR}"/../cloudberry-devops-release/build_automation/cloudberry/scripts/unittest-cloudberry.sh
557-
if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ${SRC_DIR}/../cloudberry-devops-release/build_automation/cloudberry/scripts/unittest-cloudberry.sh"; then
538+
chmod +x "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/unittest-cloudberry.sh
539+
if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ${SRC_DIR}/devops/build/automation/cloudberry/scripts/unittest-cloudberry.sh"; then
558540
echo "::error::Unittest script failed"
559541
exit 1
560542
fi
@@ -804,24 +786,6 @@ jobs:
804786
run: |
805787
echo "Timestamp from output: ${{ needs.build.outputs.build_timestamp }}"
806788
807-
- name: Checkout CI Build/Test Scripts
808-
if: needs.check-skip.outputs.should_skip != 'true'
809-
uses: actions/checkout@v4
810-
with:
811-
repository: apache/cloudberry-devops-release
812-
ref: main
813-
path: cloudberry-devops-release
814-
fetch-depth: 1
815-
816-
- name: Move cloudberry-devops-release directory
817-
if: needs.check-skip.outputs.should_skip != 'true'
818-
run: |
819-
set -eo pipefail
820-
if ! mv "${GITHUB_WORKSPACE}"/cloudberry-devops-release "${GITHUB_WORKSPACE}"/..; then
821-
echo "::error::Container initialization failed"
822-
exit 1
823-
fi
824-
825789
- name: Cloudberry Environment Initialization
826790
env:
827791
LOGS_DIR: build-logs
@@ -1167,8 +1131,8 @@ jobs:
11671131
set -eo pipefail
11681132
11691133
{
1170-
chmod +x "${SRC_DIR}"/../cloudberry-devops-release/build_automation/cloudberry/scripts/create-cloudberry-demo-cluster.sh
1171-
if ! time su - gpadmin -c "cd ${SRC_DIR} && NUM_PRIMARY_MIRROR_PAIRS='${{ matrix.num_primary_mirror_pairs }}' SRC_DIR=${SRC_DIR} ${SRC_DIR}/../cloudberry-devops-release/build_automation/cloudberry/scripts/create-cloudberry-demo-cluster.sh"; then
1134+
chmod +x "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/create-cloudberry-demo-cluster.sh
1135+
if ! time su - gpadmin -c "cd ${SRC_DIR} && NUM_PRIMARY_MIRROR_PAIRS='${{ matrix.num_primary_mirror_pairs }}' SRC_DIR=${SRC_DIR} ${SRC_DIR}/devops/build/automation/cloudberry/scripts/create-cloudberry-demo-cluster.sh"; then
11721136
echo "::error::Demo cluster creation failed"
11731137
exit 1
11741138
fi
@@ -1239,7 +1203,7 @@ jobs:
12391203
MAKE_DIRECTORY='-C $dir' \
12401204
PGOPTIONS='${PG_OPTS}' \
12411205
SRC_DIR='${SRC_DIR}' \
1242-
${SRC_DIR}/../cloudberry-devops-release/build_automation/cloudberry/scripts/test-cloudberry.sh" \
1206+
${SRC_DIR}/devops/build/automation/cloudberry/scripts/test-cloudberry.sh" \
12431207
2>&1 | tee "$config_log"; then
12441208
echo "::warning::Test execution failed for configuration $((i+1)): make -C $dir $target"
12451209
overall_status=1
@@ -1272,7 +1236,7 @@ jobs:
12721236
ls -Rl "/tmp/cloudberry-cores"
12731237
echo "-----------------------------------------"
12741238
1275-
"${SRC_DIR}"/../cloudberry-devops-release/build_automation/cloudberry/scripts/analyze_core_dumps.sh "$test_id"
1239+
"${SRC_DIR}"/devops/build/automation/cloudberry/scripts/analyze_core_dumps.sh "$test_id"
12761240
core_analysis_rc=$?
12771241
case "$core_analysis_rc" in
12781242
0) echo "No core dumps found for this configuration" ;;
@@ -1348,7 +1312,7 @@ jobs:
13481312
# Parse this configuration's results
13491313
13501314
MAKE_NAME="${{ matrix.test }}-config$i" \
1351-
"${SRC_DIR}"/../cloudberry-devops-release/build_automation/cloudberry/scripts/parse-test-results.sh "$config_log"
1315+
"${SRC_DIR}"/devops/build/automation/cloudberry/scripts/parse-test-results.sh "$config_log"
13521316
status_code=$?
13531317
13541318
{

0 commit comments

Comments
 (0)