particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mockbuild: allow inserting an extra path segment

Browse source 
GitLab CI builds its own rpms and thus it must be use a different path.
This commit modifies mockbuild.sh and deploy.sh to be able to add an
extra path segment into the path so GitLab can use a different path.

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2021-03-26 07:41:06 +01:00 • committed by Ondřej Budai
parent df74343eb8
commit 5fd2ad2337
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
schutzbot/deploy.sh
View file

@ -35,11 +35,19 @@ function setup_repo {
local project=$1 local project=$1
local commit=$2 local commit=$2
local priority=${3:-10} local priority=${3:-10}
local extra_repo_path_segment=""
if [[ "$project" == "osbuild-composer" ]]; then
# Used in the gitlab CI proof of concept so it can upload its rpms to
# a different location.
extra_repo_path_segment="${EXTRA_REPO_PATH_SEGMENT:-}"
fi
greenprint "Setting up dnf repository for ${project} ${commit}" greenprint "Setting up dnf repository for ${project} ${commit}"
sudo tee "/etc/yum.repos.d/${project}.repo" << EOF sudo tee "/etc/yum.repos.d/${project}.repo" << EOF
[${project}] [${project}]
name=${project} ${commit} name=${project} ${commit}
baseurl=http://osbuild-composer-repos.s3-website.us-east-2.amazonaws.com/${project}/${ID}-${VERSION_ID}/${ARCH}/${commit} baseurl=http://osbuild-composer-repos.s3-website.us-east-2.amazonaws.com/${extra_repo_path_segment}${project}/${ID}-${VERSION_ID}/${ARCH}/${commit}
enabled=1 enabled=1
gpgcheck=0 gpgcheck=0
priority=${priority} priority=${priority}

6
schutzbot/mockbuild.sh
View file

@ -26,9 +26,13 @@ REPO_BUCKET=osbuild-composer-repos
# Public URL for the S3 bucket with our artifacts. # Public URL for the S3 bucket with our artifacts.
MOCK_REPO_BASE_URL="http://osbuild-composer-repos.s3-website.us-east-2.amazonaws.com" MOCK_REPO_BASE_URL="http://osbuild-composer-repos.s3-website.us-east-2.amazonaws.com"
# Used in the gitlab CI proof of concept so it can upload its rpms to
# a different location.
EXTRA_REPO_PATH_SEGMENT="${EXTRA_REPO_PATH_SEGMENT:-}"
# Relative path of the repository – used for constructing both the local and # Relative path of the repository – used for constructing both the local and
# remote paths below, so that they're consistent. # remote paths below, so that they're consistent.
REPO_PATH=osbuild-composer/${ID}-${VERSION_ID}/${ARCH}/${COMMIT} REPO_PATH=${EXTRA_REPO_PATH_SEGMENT}osbuild-composer/${ID}-${VERSION_ID}/${ARCH}/${COMMIT}
# Directory to hold the RPMs temporarily before we upload them. # Directory to hold the RPMs temporarily before we upload them.
REPO_DIR=repo/${REPO_PATH} REPO_DIR=repo/${REPO_PATH}