Skip to content

package: improvements #44

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

Open
shwstppr wants to merge 5 commits into
base: main
Choose a base branch
from
+59 −20
Open

package: improvements #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2dc7521
rpm: create repo
shwstppr Aug 18, 2025
fceba3c
Update files/build.sh
shwstppr Dec 29, 2025
1e7745f
Merge remote-tracking branch 'origin/main' into pkg-createrepo
shwstppr Jan 16, 2026
363e816
allow github token
shwstppr May 15, 2026
36a652a
fix
shwstppr May 15, 2026
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ smoketests on them.

2. To build packages using `mbx`:

mbx package --repo <repo, default: shapeblue/cloudstack> --tag <tag|branch|PR, default: main> --distro <distro - el7|el8|el9|debian, default: el8> --output-dir <output directory, default: /export/testing/builds> --flags <maven build flags, default: ''>
mbx package --repo <repo, default: shapeblue/cloudstack> --tag <tag|branch|PR, default: main> --distro <distro - el7|el8|el9|debian, default: el8> --output-dir <output directory, default: /export/testing/builds> --flags <maven build flags, default: ''> --github-token <github token, optional, falls back to GITHUB_TOKEN env var>

2. To deploy an environment, run:

Expand Down
60 changes: 43 additions & 17 deletions files/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,23 @@ echo "PR ID: $PR_ID"
echo "ACS Branch: $ACS_BRANCH"
echo "Distro: $DISTRO"
echo "Flags: $FLAGS"
if [[ -n "${GITHUB_TOKEN:-}" ]]; then
echo "GitHub token: configured"
else
echo "GitHub token: not set"
fi

git_auth_args=()
curl_auth_args=()
if [[ -n "${GITHUB_TOKEN:-}" ]]; then
github_git_auth_b64="$(printf 'x-access-token:%s' "$GITHUB_TOKEN" | base64 | tr -d '\n')"
git_auth_args=(-c "http.https://github.com/.extraheader=Authorization: Basic $github_git_auth_b64")
curl_auth_args=(-H "Authorization: Bearer $GITHUB_TOKEN")
fi

run_git() {
git "${git_auth_args[@]}" "$@"
}

export ROOT=/jenkins
cd $ROOT
Expand All @@ -67,47 +84,47 @@ rm -fr deps/*jar deps/awsapi-lib deps/*.mar NONOSS
# Initialize git repository and fetch code
echo "Initializing git repository..."
if [ ! -d ".git" ]; then
git init .
git init .
fi

# Add remote origin if it doesn't exist
if ! git remote get-url origin >/dev/null 2>&1; then
echo "Adding remote origin: https://github.com/$GIT_REPO.git"
git remote add origin "https://github.com/$GIT_REPO.git"
git remote add origin "https://github.com/$GIT_REPO.git"
else
echo "Setting remote origin URL: https://github.com/$GIT_REPO.git"
git remote set-url origin "https://github.com/$GIT_REPO.git"
git remote set-url origin "https://github.com/$GIT_REPO.git"
fi

# Fetch the repository
echo "Fetching repository from https://github.com/$GIT_REPO.git"
git reset --hard
git clean -fd
git fetch origin --depth=1 --progress
run_git reset --hard
run_git clean -fd
run_git fetch origin --depth=1 --progress

if [[ "${PR_ID}" != "" ]]; then
# Find base branch
BASE=$(curl https://api.github.com/repos/$GIT_REPO/pulls/$PR_ID | jq -r '.base.ref')
git checkout ${BASE}
BASE=$(curl "${curl_auth_args[@]}" https://api.github.com/repos/$GIT_REPO/pulls/$PR_ID | jq -r '.base.ref')
run_git checkout ${BASE}
else
# For regular branches/tags
echo "Fetching and checking out: $ACS_BRANCH"
if git ls-remote --heads origin "$ACS_BRANCH" | grep -q "$ACS_BRANCH"; then
if run_git ls-remote --heads origin "$ACS_BRANCH" | grep -q "$ACS_BRANCH"; then
# It's a branch
if [ "$(git rev-parse --abbrev-ref HEAD)" = "$ACS_BRANCH" ]; then
if [ "$(run_git rev-parse --abbrev-ref HEAD)" = "$ACS_BRANCH" ]; then
echo "Already on branch $ACS_BRANCH, pulling latest changes with rebase..."
git pull --rebase origin "$ACS_BRANCH"
run_git pull --rebase origin "$ACS_BRANCH"
else
git fetch origin "$ACS_BRANCH:$ACS_BRANCH" --depth=1 --progress
git checkout "$ACS_BRANCH"
run_git fetch origin "$ACS_BRANCH:$ACS_BRANCH" --depth=1 --progress
run_git checkout "$ACS_BRANCH"
fi
elif git ls-remote --tags origin "$ACS_BRANCH" | grep -q "$ACS_BRANCH"; then
elif run_git ls-remote --tags origin "$ACS_BRANCH" | grep -q "$ACS_BRANCH"; then
# It's a tag
git fetch origin "refs/tags/$ACS_BRANCH:refs/tags/$ACS_BRANCH" --depth=1 --progress
git checkout "refs/tags/$ACS_BRANCH"
run_git fetch origin "refs/tags/$ACS_BRANCH:refs/tags/$ACS_BRANCH" --depth=1 --progress
run_git checkout "refs/tags/$ACS_BRANCH"
else
# Try to fetch as commit SHA
git checkout "$ACS_BRANCH"
run_git checkout "$ACS_BRANCH"
fi
fi

Expand Down Expand Up @@ -213,6 +230,15 @@ else
do
cp $package_folder/$pkg /output
done
for f in /etc/yum.repos.d/CentOS-*.repo; do
[ -e "$f" ] || continue
sed -i \
-e 's|^mirrorlist=|#mirrorlist=|g' \
-e 's|^#baseurl=http://mirror.centos.org|baseurl=https://vault.centos.org|g' \
"$f"
Comment thread
shwstppr marked this conversation as resolved.
done
Comment thread
shwstppr marked this conversation as resolved.
dnf install createrepo -y || true
Comment thread
shwstppr marked this conversation as resolved.
createrepo /output
Comment thread
shwstppr marked this conversation as resolved.
Comment on lines +240 to +241
Copy link

Copilot AI Feb 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the dnf install createrepo command fails (suppressed by || true), the subsequent createrepo command on line 224 will fail with an unclear error message about the command not being found. Consider checking whether createrepo was successfully installed before attempting to use it, or remove the || true to ensure the build fails fast with a clear error if the package cannot be installed.

Copilot uses AI. Check for mistakes.
fi

rm -rf $ROOT/*
Expand Down
17 changes: 15 additions & 2 deletions mbx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,10 @@ package() {
output_dir="/export/testing/builds"
pr_id=""
maven_flags=""
github_token="${GITHUB_TOKEN:-}"

# Parse named arguments
TEMP=$(getopt -o h --long help,repo:,tag:,pr:,distro:,output-dir:,flags: -n 'mbx package' -- "$@")
TEMP=$(getopt -o h --long help,repo:,tag:,pr:,distro:,output-dir:,flags:,github-token: -n 'mbx package' -- "$@")
if [ $? != 0 ]; then echo "Failed parsing options." >&2; exit 1; fi
eval set -- "$TEMP"

Expand All @@ -119,12 +120,14 @@ package() {
echo " --distro <distro> Distribution: el7/el8/el9/debian (default: el8)"
echo " --output-dir <dir> Output directory (default: /export/testing/builds)"
echo " --flags <flags> Comma-separated Maven build flags (e.g., '-DskipTests,-T4')"
echo " --github-token <token> GitHub token for private repos/tags (default: GITHUB_TOKEN env var)"
echo " -h, --help Show this help"
echo ""
echo "Examples:"
echo " mbx package --tag 4.20"
echo " mbx package --tag 1234 --distro debian --flags '-DskipTests'"
echo " mbx package --repo shapeblue/cloudstack --tag feature-branch --flags '-DskipTests,-T4'"
echo " mbx package --repo myorg/private-repo --tag 1.2.3 --github-token <token>"
exit 0
;;
--repo)
Expand Down Expand Up @@ -164,6 +167,10 @@ package() {
shift 1
fi
;;
--github-token)
github_token="$2"
shift 2
;;
--)
shift
break
Expand Down Expand Up @@ -204,6 +211,11 @@ package() {
echo " Output: $output_dir"
echo " PR ID: ${pr_id:-none}"
echo " Maven flags: ${maven_flags:-none}"
if [[ -n "$github_token" ]]; then
echo " GitHub token: configured"
else
echo " GitHub token: not set"
fi

# Generate UUID
if command -v uuid >/dev/null 2>&1; then
Expand Down Expand Up @@ -242,6 +254,7 @@ package() {
-e "PR_ID=$pr_id" \
-e "ACS_BRANCH=$tag" \
-e "DISTRO=$distro" \
-e "GITHUB_TOKEN=$github_token" \
-e "FLAGS='$maven_flags'" \
--name "$container_name" \
"$image_name" \
Expand All @@ -259,7 +272,7 @@ package() {
# Is it possible to scp local maven cache to container?

issh root@"$builder_ip" \
GIT_REPO="$repo" GIT_TAG="$tag" PR_ID="$pr_id" ACS_BRANCH="$tag" DISTRO="$distro" FLAGS="'$maven_flags'" \
GIT_REPO="$repo" GIT_TAG="$tag" PR_ID="$pr_id" ACS_BRANCH="$tag" DISTRO="$distro" GITHUB_TOKEN="$github_token" FLAGS="'$maven_flags'" \
bash -x /jenkins/build.sh

echo "Packages can be found at $output_dir"
Expand Down