Skip to content

MDBF-1264: Connectors :: generate sha256 for uploaded artifacts #1020

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

Merged
RazvanLiviuVarzaru merged 1 commit into from
Oct 27, 2026
Merged

MDBF-1264: Connectors :: generate sha256 for uploaded artifacts #1020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion configuration/builders/definitions/connectors/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Under `CONNECTORS_PACKAGES_DIR/<c|cpp|odbc>` on the worker hosts, served at `<AR
| What | Where |
| --- | --- |
| Source package, `git archive` and `sha256sums.txt` | `<tarbuildnum>/` |
| A builder's packages | `<tarbuildnum>/<builder>/` |
| A builder's packages and `sha256sums.txt` | `<tarbuildnum>/<builder>/` |

## Maintenance

Expand Down
27 changes: 25 additions & 2 deletions configuration/builders/sequences/connectors/conc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ def tarball(config: DockerConfig):
input_dir=PurePath("."),
output_dir=PurePath("ci_source"),
tarball_name="ci.tar.gz",
generate_sha256=True,
),
options=StepOptions(
description="Archive source code",
Expand Down Expand Up @@ -124,9 +123,9 @@ def tarball(config: DockerConfig):
packages=[
"ci_source/ci.tar.gz",
"*src.tar.gz",
"ci_source/sha256sums.txt",
],
destination="/packages/%(prop:buildnumber)s",
generate_sha256=True,
),
url=URL(
url=f"{os.environ['ARTIFACTS_URL']}/connector-c/%(prop:buildnumber)s",
Expand Down Expand Up @@ -323,6 +322,7 @@ def save_packages(config: DockerConfig, packages: list[str], user: str = "buildb
packages=packages,
destination="/packages/%(prop:tarbuildnum)s/%(prop:buildername)s",
user=user,
generate_sha256=True,
),
options=StepOptions(
description="Save packages",
Expand Down Expand Up @@ -419,6 +419,20 @@ def windows(jobs: int, target_platform: str):
),
)

sequence.add_step(
ShellStep(
command=BashCommand(
name="MSI sha256sums",
cmd='sha256sum "%(prop:packages)s" > sha256sums.txt',
workdir=PurePath("win\\packaging"),
),
options=StepOptions(
description="Write MSI sha256sums",
descriptionDone="MSI sha256sums written",
),
),
)

sequence.add_step(
FileUpload(
workersrc="win\\packaging\\%(prop:packages)s",
Expand All @@ -427,4 +441,13 @@ def windows(jobs: int, target_platform: str):
url=f"{os.environ['ARTIFACTS_URL']}/connector-c/%(prop:tarbuildnum)s/%(prop:buildername)s/",
)
)

sequence.add_step(
FileUpload(
workersrc="win\\packaging\\sha256sums.txt",
masterdest="/srv/buildbot/connectors/c/%(prop:tarbuildnum)s/%(prop:buildername)s/sha256sums.txt",
mode=0o644,
url=f"{os.environ['ARTIFACTS_URL']}/connector-c/%(prop:tarbuildnum)s/%(prop:buildername)s/sha256sums.txt",
)
)
return sequence
27 changes: 25 additions & 2 deletions configuration/builders/sequences/connectors/concpp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ def tarball(config: DockerConfig):
input_dir=PurePath("."),
output_dir=PurePath("ci_source"),
tarball_name="ci.tar.gz",
generate_sha256=True,
),
options=StepOptions(
description="Archive source code",
Expand Down Expand Up @@ -176,9 +175,9 @@ def tarball(config: DockerConfig):
packages=[
"ci_source/ci.tar.gz",
"*src.tar.gz",
"ci_source/sha256sums.txt",
],
destination="/packages/%(prop:buildnumber)s",
generate_sha256=True,
),
url=URL(
url=f"{os.environ['ARTIFACTS_URL']}/connector-cpp/%(prop:buildnumber)s",
Expand Down Expand Up @@ -798,6 +797,7 @@ def save_packages(config: DockerConfig, packages: list[str], user: str = "buildb
packages=packages,
destination="/packages/%(prop:tarbuildnum)s/%(prop:buildername)s",
user=user,
generate_sha256=True,
),
options=StepOptions(
description="Save packages",
Expand Down Expand Up @@ -893,6 +893,20 @@ def windows(jobs: int, target_platform: str):
),
)

sequence.add_step(
ShellStep(
command=BashCommand(
name="MSI sha256sums",
cmd='sha256sum "%(prop:packages)s" > sha256sums.txt',
workdir=PurePath("wininstall"),
),
options=StepOptions(
description="Write MSI sha256sums",
descriptionDone="MSI sha256sums written",
),
),
)

sequence.add_step(
FileUpload(
workersrc="wininstall\\%(prop:packages)s",
Expand All @@ -901,4 +915,13 @@ def windows(jobs: int, target_platform: str):
url=f"{os.environ['ARTIFACTS_URL']}/connector-cpp/%(prop:tarbuildnum)s/%(prop:buildername)s/",
)
)

sequence.add_step(
FileUpload(
workersrc="wininstall\\sha256sums.txt",
masterdest="/srv/buildbot/connectors/cpp/%(prop:tarbuildnum)s/%(prop:buildername)s/sha256sums.txt",
mode=0o644,
url=f"{os.environ['ARTIFACTS_URL']}/connector-cpp/%(prop:tarbuildnum)s/%(prop:buildername)s/sha256sums.txt",
)
)
return sequence
27 changes: 25 additions & 2 deletions configuration/builders/sequences/connectors/conodbc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ def tarball(config: DockerConfig):
input_dir=PurePath("."),
output_dir=PurePath("ci_source"),
tarball_name="ci.tar.gz",
generate_sha256=True,
),
options=StepOptions(
description="Archive source code",
Expand Down Expand Up @@ -177,9 +176,9 @@ def tarball(config: DockerConfig):
packages=[
"ci_source/ci.tar.gz",
"*src.tar.gz",
"ci_source/sha256sums.txt",
],
destination="/packages/%(prop:buildnumber)s",
generate_sha256=True,
),
url=URL(
url=f"{os.environ['ARTIFACTS_URL']}/connector-odbc/%(prop:buildnumber)s",
Expand Down Expand Up @@ -816,6 +815,7 @@ def save_packages(config: DockerConfig, packages: list[str], user: str = "buildb
packages=packages,
destination="/packages/%(prop:tarbuildnum)s/%(prop:buildername)s",
user=user,
generate_sha256=True,
),
options=StepOptions(
description="Save packages",
Expand Down Expand Up @@ -1012,6 +1012,20 @@ def windows(jobs: int, target_platform: str):
),
)

sequence.add_step(
ShellStep(
command=BashCommand(
name="MSI sha256sums",
cmd='sha256sum "%(prop:packages)s" > sha256sums.txt',
workdir=PurePath("packaging\\windows"),
),
options=StepOptions(
description="Write MSI sha256sums",
descriptionDone="MSI sha256sums written",
),
),
)

sequence.add_step(
FileUpload(
workersrc="packaging/windows/%(prop:packages)s",
Expand All @@ -1021,6 +1035,15 @@ def windows(jobs: int, target_platform: str):
)
)

sequence.add_step(
FileUpload(
workersrc="packaging/windows/sha256sums.txt",
masterdest="/srv/buildbot/connectors/odbc/%(prop:tarbuildnum)s/%(prop:buildername)s/sha256sums.txt",
mode=0o644,
url=f"{os.environ['ARTIFACTS_URL']}/connector-odbc/%(prop:tarbuildnum)s/%(prop:buildername)s/sha256sums.txt",
)
)

sequence.add_step(
ShellStep(
command=PowerShellCommand(
Expand Down
26 changes: 23 additions & 3 deletions configuration/steps/commands/packages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ class SavePackages(Command):
This class is used to recursively copy a list of files and dirs to CI,
starting from the current working directory and
assuming that /packages is bind mounted.
With generate_sha256, it also writes a sha256sums.txt listing every
file the build saved to the destination.
"""

def __init__(
Expand All @@ -118,14 +120,34 @@ def __init__(
workdir: PurePath = PurePath("."),
destination: str = "/packages/%(prop:tarbuildnum)s/%(prop:buildername)s",
user: str = "buildbot",
generate_sha256: bool = False,
):
name = "Save packages"
self.packages = packages
self.destination = destination
self.generate_sha256 = generate_sha256
assert not (generate_sha256 and workdir.is_absolute())
# The sums are kept at the build's root, which the workdir is
# relative to: /home/buildbot in a container, build/ on a host.
root = "../" * len(workdir.parts)
self.sums_dir = f"{root}sha256sums/{destination.lstrip('/')}"
super().__init__(name=name, workdir=workdir, user=user)

def as_cmd_arg(self) -> list[str]:
package_list = " ".join(self.packages)
sha256sums = f"""
mkdir -p "{self.sums_dir}"
for package in {package_list}; do
[[ -e "${{package}}" ]] || continue
(
cd "$(dirname "${{package}}")"
find -L "$(basename "${{package}}")" -type f -exec sha256sum {{}} +
)
done >> "{self.sums_dir}/sha256sums.txt"
if [[ -s "{self.sums_dir}/sha256sums.txt" ]]; then
cp -f "{self.sums_dir}/sha256sums.txt" "{self.destination}/sha256sums.txt"
fi
"""
result = [
"bash",
"-exc",
Expand All @@ -139,6 +161,7 @@ def as_cmd_arg(self) -> list[str]:
fi
cp -r $package {self.destination}
done
{sha256sums if self.generate_sha256 else ""}
"""
),
]
Expand Down Expand Up @@ -222,12 +245,10 @@ def __init__(
input_dir: PurePath,
output_dir: PurePath,
tarball_name: str,
generate_sha256: bool = False,
):
self.input_dir = input_dir
self.output_dir = output_dir
self.tarball_name = tarball_name
self.generate_sha256 = generate_sha256
super().__init__(name="Archive source code", workdir=input_dir)

def as_cmd_arg(self) -> list[str]:
Expand All @@ -237,7 +258,6 @@ def as_cmd_arg(self) -> list[str]:
f"""
mkdir -p {self.output_dir}
tar --exclude-vcs --exclude {self.output_dir} -czf {self.output_dir}/{self.tarball_name} -C {self.input_dir} .
{f"sha256sum {self.output_dir}/{self.tarball_name} > {self.output_dir}/sha256sums.txt" if self.generate_sha256 else ""}
""",
]
return result
Expand Down
2 changes: 1 addition & 1 deletion script_templates/get_tarball.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ f="${tarbuildnum}/$tarball"

verify_checksum() {
echo "verify checksum"
checksum=$(wget -qO- "$artifacts_url/$tarbuildnum/sha256sums.txt" | awk '{print $1}')
checksum=$(wget -qO- "$artifacts_url/$tarbuildnum/sha256sums.txt" | grep -F "${tarball}" | awk '{print $1}')
checksum_file=$(sha256sum "$1" | awk '{print $1}')

if [[ "$checksum_file" == "$checksum" ]]; then
Expand Down