From: Martin Pitt <martin@piware.de>
Date: Fri, 8 Jan 2021 09:27:03 +0000 (+0100)
Subject: Move RHEL tools from a separate toolbox to an install script
X-Git-Url: https://piware.de/gitweb/?a=commitdiff_plain;h=d6768a0d28550e44c826bb053e34a24c4471df6d;p=bin.git

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.
---

diff --git a/build-rhtoolbox b/build-rhtoolbox
deleted file mode 100755
index f70b359..0000000
--- a/build-rhtoolbox
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-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
-
-# 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 <<EOF | sudo tee /etc/krb5.conf.d/0_file_ccache
-[libdefaults]
-    default_ccache_name = FILE:/tmp/krb5.ccache
-EOF
-'
diff --git a/install-rhel-tools b/install-rhel-tools
new file mode 100755
index 0000000..06b58dd
--- /dev/null
+++ b/install-rhel-tools
@@ -0,0 +1,15 @@
+#!/bin/sh
+# Install RHEL development tools into a toolbox
+set -eux
+
+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
+
+# 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