From 5400d3e9b6445f1962d7eeee250ea70ef8f5a82b Mon Sep 17 00:00:00 2001 From: Jiri Kortus Date: Wed, 13 May 2020 18:34:42 +0200 Subject: [PATCH] [tests] Remove vm-local-repos Makefile target Related: rhbz#1810711 --- Makefile | 19 ------------------- test/README.md | 8 -------- 2 files changed, 27 deletions(-) diff --git a/Makefile b/Makefile index ccdf08db..535fd008 100644 --- a/Makefile +++ b/Makefile @@ -17,10 +17,6 @@ endif export TEST_OS VM_IMAGE=$(CURDIR)/test/images/$(TEST_OS) -ifeq ($(REPOS_DIR),) -REPOS_DIR = /etc/yum.repos.d -endif - default: all src/composer/version.py: @@ -134,21 +130,6 @@ $(VM_IMAGE): srpm bots vm: $(VM_IMAGE) echo $(VM_IMAGE) -# grab all repositories from the host system, overwriting what's inside the VM -# and update the image. Mostly used when testing downstream snapshots to make -# sure VM_IMAGE is as close as possible to the host! -vm-local-repos: vm - bots/image-customize -v \ - --run-command "rm -rf /etc/yum.repos.d" \ - $(TEST_OS) - bots/image-customize -v \ - --upload $(REPOS_DIR):/etc/yum.repos.d \ - --run-command "yum -y remove composer-cli lorax-composer" \ - --run-command "yum -y update" \ - --run-command "yum -y install composer-cli lorax-composer" \ - --run-command "systemctl enable lorax-composer" \ - $(TEST_OS) - vm-releng: rm -f $(VM_IMAGE) $(VM_IMAGE).qcow2 bots/image-customize -v \ diff --git a/test/README.md b/test/README.md index e765979d..f208fdc4 100644 --- a/test/README.md +++ b/test/README.md @@ -41,14 +41,6 @@ To delete the generated image, run Base images are stored in `bots/images`. Set `TEST_DATA` to override this directory. -To configure the image with all repositories found on the host system use - - $ make vm-local-repos - -You may also define `REPOS_DIR` variable to point to another directory -containing yum .repo files. By default the value is `/etc/yum.repos.d`! -This is mostly useful when running tests by hand on a downstream snapshot! - If you need to run the tests on a particular rel-eng RHEL compose, you can create the image by using [image-create-rhel-compose](https://github.com/cockpit-project/bots/blob/master/image-create-rhel-compose) script from bots repo. By default it uses the `-latest` extras rel-eng repo,