From d6768a0d28550e44c826bb053e34a24c4471df6d Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 8 Jan 2021 10:27:03 +0100 Subject: [PATCH] Move RHEL tools from a separate toolbox to an install script It's more efficient and convenient to install these tools into an existing toolbox. --- build-rhtoolbox => install-rhel-tools | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) rename build-rhtoolbox => install-rhel-tools (53%) diff --git a/build-rhtoolbox b/install-rhel-tools similarity index 53% rename from build-rhtoolbox rename to install-rhel-tools index f70b359..06b58dd 100755 --- a/build-rhtoolbox +++ b/install-rhel-tools @@ -1,36 +1,15 @@ #!/bin/sh +# Install RHEL development tools into a toolbox set -eux -NAME=redhat -RELEASE=33 - -toolbox rm --force $NAME || true -yes | toolbox create --release $RELEASE -c $NAME - -# install cockpit's build deps and other development tools -toolbox run -c "$NAME" sh -exc ' -# useful hostname -echo "redhat" | sudo tee /etc/hostname -sudo hostname -F /etc/hostname - -sudo dnf update -y sudo curl -o /etc/pki/ca-trust/source/anchors/RH-IT-Root-CA.crt https://password.corp.redhat.com/RH-IT-Root-CA.crt sudo update-ca-trust (cd /etc/yum.repos.d; sudo curl -O --location https://download.devel.redhat.com/rel-eng/RCMTOOLS/rcm-tools-fedora.repo) -sudo dnf install -y rhpkg krb5-workstation +sudo dnf install -y rhpkg # 1minutetip sudo umount /mnt # HACK: rhts-test-env-5.0-2.fc32eng.noarch wants to fiddle with it sudo wget -O /etc/yum.repos.d/qa-tools.repo http://liver.brq.redhat.com/repo/qa-tools.repo sudo wget -O /etc/yum.repos.d/beaker-client.repo http://download.lab.bos.redhat.com/beakerrepos/beaker-client-Fedora.repo sudo dnf install -y qa-tools-workstation-1minutetip - -sudo dnf clean packages - -# unbreak kerberos; https://github.com/debarshiray/toolbox/issues/235 -cat <