Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions .github/workflows/build-citus-community-nightlies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,11 @@ jobs:
fail-fast: false
matrix:
platform:
- el/7
- el/8
- ol/7
- debian/bullseye
- el/9
- ol/9
- debian/bookworm
- debian/trixie
- ubuntu/bionic
- ubuntu/noble
- ubuntu/jammy

Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/citus-package-all-platforms-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,14 @@ jobs:
fail-fast: false
matrix:
platform:
- el/7
- el/9
- el/8
- ol/7
- ol/9
- ol/8
- debian/stretch
- debian/bullseye
- ubuntu/bionic
- debian/bookworm
- debian/trixie
- ubuntu/jammy
- ubuntu/noble
env:
PLATFORM: ${{ matrix.platform }}
Expand Down
20 changes: 10 additions & 10 deletions packaging_automation/tests/test_citus_package.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@

single_postgres_package_counts = {
"el/7": 2,
"el/8": 3,
"el/8": 1,
"ol/7": 2,
"ol/8": 3,
"almalinux/9": 3,
"almalinux/8": 3,
"ol/8": 1,
"almalinux/9": 1,
"almalinux/8": 1,
"rockylinux/9": 3,
"el/9": 3,
"ol/9": 3,
"el/9": 1,
"ol/9": 1,
"debian/stretch": 2,
"debian/bullseye": 2,
"debian/bookworm": 2,
Expand Down Expand Up @@ -94,7 +94,7 @@ def setup_module():

def teardown_module():
if os.path.exists("packaging_test"):
run("rm -r packaging_test")
run("rm -rf packaging_test")


def test_build_packages():
Expand Down Expand Up @@ -137,16 +137,16 @@ def test_build_packages():
)
assert os.path.exists(postgres_version_file_path)
config = dotenv_values(postgres_version_file_path)
assert config["release_versions"] == "12,13,14"
assert config["nightly_versions"] == "14,15"
assert config["release_versions"] == "15,16,17"
assert config["nightly_versions"] == "16,17,18"


def test_get_required_package_count():
assert (
get_required_package_count(
input_files_dir=PACKAGING_EXEC_FOLDER, platform="el/8"
)
== 9
== 3
)


Expand Down
6 changes: 3 additions & 3 deletions packaging_automation/tests/test_citus_package_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,15 +166,15 @@ def test_build_package_debian():
def test_build_package_rpm():
input_output_parameters = InputOutputParameters.build(
PACKAGING_EXEC_FOLDER,
f"{OUTPUT_FOLDER}/debian-stretch",
f"{OUTPUT_FOLDER}/rpm_build",
output_validation=False,
)

build_package(
github_token=GH_TOKEN,
build_type=BuildType.release,
docker_platform="almalinux-8",
postgres_version="13",
docker_platform="almalinux-9",
postgres_version="17",
input_output_parameters=input_output_parameters,
is_test=True,
)
Expand Down
Loading