mockbuild: change repository path
Change the repository path on S3 to a more predictable one. We really
only need the name of the project (static osbuild for this repository),
the name of the distro (use the same as osbuild-composer's API for
consistency) and the commit SHA.
In particular, drop the PR number / branch name. Also don't remove the
dots from version numbers. All places we're using them in (paths and
URLs) support dots.
For example, osbuild commit xxxxxxx for fedora-33 on x86_64 will result
in this URL:
osbuild/fedora-33/x86_64/xxxxxxx
This commit is contained in:
parent
e3aec65636
commit
5b827cb0d5
1 changed files with 2 additions and 2 deletions
|
|
@ -49,7 +49,7 @@ MOCK_REPO_BASE_URL="http://osbuild-composer-repos.s3-website.us-east-2.amazonaws
|
|||
|
||||
# Relative path of the repository – used for constructing both the local and
|
||||
# remote paths below, so that they're consistent.
|
||||
REPO_PATH=${JOB_NAME}/${COMMIT}/${ID}${VERSION_ID//./}_${ARCH}
|
||||
REPO_PATH=osbuild/${ID}-${VERSION_ID}/${ARCH}/${COMMIT}
|
||||
|
||||
# Directory to hold the RPMs temporarily before we upload them.
|
||||
REPO_DIR=repo/${REPO_PATH}
|
||||
|
|
@ -95,7 +95,7 @@ popd
|
|||
greenprint "📜 Generating dnf repository file"
|
||||
tee osbuild-mock.repo << EOF
|
||||
[osbuild-mock]
|
||||
name=osbuild mock ${JOB_NAME}-${COMMIT} ${ID}${VERSION_ID//./}
|
||||
name=osbuild mock ${COMMIT}
|
||||
baseurl=${REPO_URL}
|
||||
enabled=1
|
||||
gpgcheck=0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue