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

ci: remove EXTRA_REPO_PATH_SEGMENT

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

14
.gitlab-ci.yml
View file

@ -29,8 +29,6 @@ RPM:
extends: .terraform extends: .terraform
rules: rules:
- if: '$CI_PIPELINE_SOURCE != "schedule"' - if: '$CI_PIPELINE_SOURCE != "schedule"'
variables:
EXTRA_REPO_PATH_SEGMENT: "gitlab/"
script: script:
- sh "schutzbot/mockbuild.sh" - sh "schutzbot/mockbuild.sh"
after_script: after_script:
@ -57,8 +55,6 @@ Container:
extends: .terraform extends: .terraform
rules: rules:
- if: '$CI_PIPELINE_SOURCE != "schedule"' - if: '$CI_PIPELINE_SOURCE != "schedule"'
variables:
EXTRA_REPO_PATH_SEGMENT: "gitlab/"
script: script:
- sh "schutzbot/containerbuild.sh" - sh "schutzbot/containerbuild.sh"
parallel: parallel:
@ -71,8 +67,6 @@ Prepare-rhel-internal:
extends: .terraform extends: .terraform
rules: rules:
- if: '$CI_PIPELINE_SOURCE == "schedule"' - if: '$CI_PIPELINE_SOURCE == "schedule"'
variables:
EXTRA_REPO_PATH_SEGMENT: "gitlab/"
script: script:
- schutzbot/prepare-rhel-internal.sh - schutzbot/prepare-rhel-internal.sh
artifacts: artifacts:
@ -93,8 +87,6 @@ Base:
rules: rules:
- if: '$CI_PIPELINE_SOURCE != "schedule"' - if: '$CI_PIPELINE_SOURCE != "schedule"'
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[8-9]\.[\S]+/' - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[8-9]\.[\S]+/'
variables:
EXTRA_REPO_PATH_SEGMENT: "gitlab/"
script: script:
- schutzbot/deploy.sh - schutzbot/deploy.sh
- /usr/libexec/tests/osbuild-composer/base_tests.sh - /usr/libexec/tests/osbuild-composer/base_tests.sh
@ -128,8 +120,6 @@ OSTree:
rules: rules:
- if: '$CI_PIPELINE_SOURCE != "schedule"' - if: '$CI_PIPELINE_SOURCE != "schedule"'
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[8-9]\.[\S]+/' - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[8-9]\.[\S]+/'
variables:
EXTRA_REPO_PATH_SEGMENT: "gitlab/"
script: script:
- schutzbot/deploy.sh - schutzbot/deploy.sh
- /usr/libexec/tests/osbuild-composer/ostree.sh - /usr/libexec/tests/osbuild-composer/ostree.sh
@ -170,8 +160,6 @@ Integration:
rules: rules:
- if: '$CI_PIPELINE_SOURCE != "schedule"' - if: '$CI_PIPELINE_SOURCE != "schedule"'
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[8-9]\.[\S]+/' - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[8-9]\.[\S]+/'
variables:
EXTRA_REPO_PATH_SEGMENT: "gitlab/"
script: script:
- schutzbot/deploy.sh - schutzbot/deploy.sh
- /usr/libexec/tests/osbuild-composer/${SCRIPT} - /usr/libexec/tests/osbuild-composer/${SCRIPT}
@ -212,8 +200,6 @@ API:
rules: rules:
- if: '$CI_PIPELINE_SOURCE != "schedule"' - if: '$CI_PIPELINE_SOURCE != "schedule"'
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[8-9]\.[\S]+/' - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[8-9]\.[\S]+/'
variables:
EXTRA_REPO_PATH_SEGMENT: "gitlab/"
script: script:
- schutzbot/deploy.sh - schutzbot/deploy.sh
- /usr/libexec/tests/osbuild-composer/api.sh ${TARGET} - /usr/libexec/tests/osbuild-composer/api.sh ${TARGET}

10
schutzbot/deploy.sh
View file

@ -35,19 +35,11 @@ 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/${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 enabled=1
gpgcheck=0 gpgcheck=0
priority=${priority} priority=${priority}

6
schutzbot/mockbuild.sh
View file

@ -26,13 +26,9 @@ 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=${EXTRA_REPO_PATH_SEGMENT}osbuild-composer/${ID}-${VERSION_ID}/${ARCH}/${COMMIT} REPO_PATH=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}