Skip to content
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

Jump to bottom

Adjust variable names #64

Merged
merged 3 commits into from
Oct 21, 2021
Merged

Adjust variable names #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b486a26
mockbuild: do not subscribe
ondrejbudai Oct 21, 2021
b04bfc4
mockbuild: rotate a variable name
ondrejbudai Oct 21, 2021
1d3aa9c
gitlab: do not save the journal
ondrejbudai Oct 21, 2021
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
6 changes: 0 additions & 6 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ stages:
.terraform:
tags:
- terraform
artifacts:
paths:
- journal-log
when: always

init:
stage: init
Expand All @@ -27,7 +23,6 @@ RPM:
- sh "schutzbot/mockbuild.sh"
after_script:
- schutzbot/update_github_status.sh update
- schutzbot/save_journal.sh
parallel:
matrix:
- RUNNER:
Expand All @@ -47,7 +42,6 @@ Testing:
- sh "/usr/libexec/tests/koji-osbuild/integration.sh"
after_script:
- schutzbot/update_github_status.sh update
- schutzbot/save_journal.sh
parallel:
matrix:
- RUNNER:
Expand Down
9 changes: 2 additions & 7 deletions schutzbot/mockbuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,6 @@ function greenprint {
source /etc/os-release
ARCH=$(uname -m)

# Register RHEL if we are provided with a registration script.
if [[ $ID == "rhel" && -n "${RHN_REGISTRATION_SCRIPT:-}" ]] && ! sudo subscription-manager status; then
greenprint "🪙 Registering RHEL instance"
sudo chmod +x $RHN_REGISTRATION_SCRIPT
sudo $RHN_REGISTRATION_SCRIPT
fi

# Mock configuration file to use for building RPMs.
MOCK_CONFIG="${ID}-${VERSION_ID%.*}-$(uname -m)"

Expand Down Expand Up @@ -99,5 +92,7 @@ createrepo_c ${REPO_DIR}
# Upload repository to S3.
greenprint "☁ Uploading RPMs to S3"
pushd repo
AWS_ACCESS_KEY_ID="$V2_AWS_ACCESS_KEY_ID" \
AWS_SECRET_ACCESS_KEY="$V2_AWS_SECRET_ACCESS_KEY" \
s3cmd --acl-public put --recursive . s3://${REPO_BUCKET}/
popd
4 changes: 0 additions & 4 deletions schutzbot/save_journal.sh
View file
Open in desktop

This file was deleted.