diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 115a342d..26a36a7a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,10 +36,8 @@ RPM: - aws/fedora-34-aarch64 - aws/centos-stream-8-x86_64 - aws/centos-stream-8-aarch64 - - RUNNER: - aws/rhel-8.4-ga-x86_64 - aws/rhel-8.4-ga-aarch64 - REGISTER: "true" - RUNNER: - aws/rhel-8.5-nightly-x86_64 - aws/rhel-8.5-nightly-aarch64 @@ -60,15 +58,8 @@ Testing: - RUNNER: - aws/fedora-33-x86_64 - aws/fedora-33-aarch64 - INTERNAL_NETWORK: "true" - - RUNNER: - aws/rhel-8.4-ga-x86_64 - REGISTER: "true" - INTERNAL_NETWORK: "true" - - RUNNER: - aws/rhel-8.5-nightly-x86_64 - INTERNAL_NETWORK: "true" - - RUNNER: - aws/rhel-9.0-beta-nightly-x86_64 INTERNAL_NETWORK: "true" diff --git a/schutzbot/deploy.sh b/schutzbot/deploy.sh index 34e42978..6dcb4ec5 100755 --- a/schutzbot/deploy.sh +++ b/schutzbot/deploy.sh @@ -11,13 +11,6 @@ OSBUILD_COMPOSER_COMMIT=9497ef8ca9e05a177dc8ec5cbb80b98ad450b041 source /etc/os-release ARCH=$(uname -m) -# Register RHEL if we are provided with a registration script and intend to do that. -REGISTER="${REGISTER:-'false'}" -if [[ $REGISTER == "true" && -n "${RHN_REGISTRATION_SCRIPT:-}" ]] && ! sudo subscription-manager status; then - sudo chmod +x $RHN_REGISTRATION_SCRIPT - sudo $RHN_REGISTRATION_SCRIPT -fi - # Add osbuild team ssh keys. cat schutzbot/team_ssh_keys.txt | tee -a ~/.ssh/authorized_keys > /dev/null