ci: remove EXTRA_REPO_PATH_SEGMENT

EXTRA_REPO_PATH_SEGMENT was needed when both Jenkins and Gitlab CI
were running in parallel (so they don't override their artifacts).

Jenkins is now decommissioned so we can drop the variable.

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2021-06-29 10:33:49 +02:00 committed by Ondřej Budai
parent cc2c354371
commit 419ac4c769
3 changed files with 2 additions and 28 deletions

View file

@ -35,19 +35,11 @@ function setup_repo {
local project=$1
local commit=$2
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}"
sudo tee "/etc/yum.repos.d/${project}.repo" << EOF
[${project}]
name=${project} ${commit}
baseurl=http://osbuild-composer-repos.s3-website.us-east-2.amazonaws.com/${extra_repo_path_segment}${project}/${ID}-${VERSION_ID}/${ARCH}/${commit}
baseurl=http://osbuild-composer-repos.s3-website.us-east-2.amazonaws.com/${project}/${ID}-${VERSION_ID}/${ARCH}/${commit}
enabled=1
gpgcheck=0
priority=${priority}