From 9b15fc763dbf1c4773dd679cee75ee8909f2a7ed Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Fri, 15 May 2020 10:44:10 +0200 Subject: install_test.sh: rename to install_test_obs.sh Change-Id: I4438e20b921a4a57200e7fb8b276ffa78ba6ca34 --- rpm-local/install_test.sh | 20 -------------------- rpm-local/install_test_obs.sh | 20 ++++++++++++++++++++ rpm-local/scripts/install_test.sh | 19 ------------------- rpm-local/scripts/install_test_obs.sh | 19 +++++++++++++++++++ 4 files changed, 39 insertions(+), 39 deletions(-) delete mode 100755 rpm-local/install_test.sh create mode 100755 rpm-local/install_test_obs.sh delete mode 100755 rpm-local/scripts/install_test.sh create mode 100755 rpm-local/scripts/install_test_obs.sh diff --git a/rpm-local/install_test.sh b/rpm-local/install_test.sh deleted file mode 100755 index 0aa04ee..0000000 --- a/rpm-local/install_test.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -ex -DIR="$(cd "$(dirname "$0")" && pwd -P)" -IMAGE="centos8" - -if ! [ -e ".build.docker.$IMAGE" ]; then - echo "ERROR: run build.sh first, to generate the docker img" - exit 1 -fi - - -docker run \ - -it \ - --rm \ - -v "$DIR/rpmbuild:/home/user/rpmbuild" \ - -v "$DIR/scripts:/scripts" \ - -v "$DIR/cache/$IMAGE/dnf:/var/cache/dnf" \ - -v "$DIR/cache/yum_repos:/root/yum_repos" \ - -v "$DIR/cache/distfiles:/home/user/distfiles" \ - "$IMAGE:latest" \ - /scripts/install_test.sh diff --git a/rpm-local/install_test_obs.sh b/rpm-local/install_test_obs.sh new file mode 100755 index 0000000..e93c1f7 --- /dev/null +++ b/rpm-local/install_test_obs.sh @@ -0,0 +1,20 @@ +#!/bin/sh -ex +DIR="$(cd "$(dirname "$0")" && pwd -P)" +IMAGE="centos8" + +if ! [ -e ".build.docker.$IMAGE" ]; then + echo "ERROR: run build.sh first, to generate the docker img" + exit 1 +fi + + +docker run \ + -it \ + --rm \ + -v "$DIR/rpmbuild:/home/user/rpmbuild" \ + -v "$DIR/scripts:/scripts" \ + -v "$DIR/cache/$IMAGE/dnf:/var/cache/dnf" \ + -v "$DIR/cache/yum_repos:/root/yum_repos" \ + -v "$DIR/cache/distfiles:/home/user/distfiles" \ + "$IMAGE:latest" \ + /scripts/install_test_obs.sh diff --git a/rpm-local/scripts/install_test.sh b/rpm-local/scripts/install_test.sh deleted file mode 100755 index 28b66b1..0000000 --- a/rpm-local/scripts/install_test.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -ex -REPO_FILE="home:osmith42.repo" - -# Download repo file -cd /root/yum_repos -if ! [ -e "$REPO_FILE" ]; then - dnf --setopt=keepcache=1 -y install wget - wget https://download.opensuse.org/repositories/home:osmith42/CentOS_8_Stream/home:osmith42.repo -fi - -# Enable repo -cp "/root/yum_repos/$REPO_FILE" "/etc/yum.repos.d/$REPO_FILE" - -# update index -dnf --setopt=keepcache=1 -y check-update /etc/yum.repos.d/$REPO_FILE - -# install packages -# somehow -y is not enough -yes | dnf --setopt=keepcache=1 -y install osmo-trx-uhd diff --git a/rpm-local/scripts/install_test_obs.sh b/rpm-local/scripts/install_test_obs.sh new file mode 100755 index 0000000..28b66b1 --- /dev/null +++ b/rpm-local/scripts/install_test_obs.sh @@ -0,0 +1,19 @@ +#!/bin/sh -ex +REPO_FILE="home:osmith42.repo" + +# Download repo file +cd /root/yum_repos +if ! [ -e "$REPO_FILE" ]; then + dnf --setopt=keepcache=1 -y install wget + wget https://download.opensuse.org/repositories/home:osmith42/CentOS_8_Stream/home:osmith42.repo +fi + +# Enable repo +cp "/root/yum_repos/$REPO_FILE" "/etc/yum.repos.d/$REPO_FILE" + +# update index +dnf --setopt=keepcache=1 -y check-update /etc/yum.repos.d/$REPO_FILE + +# install packages +# somehow -y is not enough +yes | dnf --setopt=keepcache=1 -y install osmo-trx-uhd -- cgit v1.2.3