Differential D366

Makefile: revert MOCKCHAINREPO location
ClosedPublic
Actions

Authored by kparal on May 5 2015, 11:30 AM.

Details

Reviewers
tflink
mkrizek
jskladan
Commits
rLTRN53ae972c67ac: Makefile: revert MOCKCHAINREPO location
Summary

This reverts a change introduced in de88ab83c2. The mock bug (RHBZ 1209532) has been fixed in mock-1.2.8-1, so we can now go back to the original mockchain location and there are no issues with it.

Test Plan

I tested several times running make mockchain with the updated mock. No issues.

Diff Detail

Repository
rLTRN libtaskotron
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
kparal retitled this revision from to Makefile: revert MOCKCHAINREPO location.May 5 2015, 11:30 AM
kparal updated this object.
kparal edited the test plan for this revision. (Show Details)
kparal added reviewers: tflink, jskladan, mkrizek.
kparal updated this object.May 5 2015, 11:34 AM
jskladan accepted this revision.May 6 2015, 7:33 AM
This revision is now accepted and ready to land.May 6 2015, 7:33 AM
Closed by commit rLTRN53ae972c67ac: Makefile: revert MOCKCHAINREPO location (authored by kparal). · Explain WhyMay 6 2015, 8:40 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathPackages
MMakefile (3 lines)

Diff 972

View Options

Makefile

Show All 27 Lines
28DIST:=$(shell rpm --eval '%{dist}') 28​DIST:=$(shell rpm --eval '%{dist}')
29VERSION:=$(shell rpmspec -q --queryformat="%{VERSION}\n" $(SPECFILE) | uniq) 29​VERSION:=$(shell rpmspec -q --queryformat="%{VERSION}\n" $(SPECFILE) | uniq)
30RELEASE:=$(subst $(DIST),,$(shell rpmspec -q --queryformat="%{RELEASE}\n" $(SPECFILE) | uniq)) 30​RELEASE:=$(subst $(DIST),,$(shell rpmspec -q --queryformat="%{RELEASE}\n" $(SPECFILE) | uniq))
31NVR:=$(SRC)-$(VERSION)-$(RELEASE) 31​NVR:=$(SRC)-$(VERSION)-$(RELEASE)
32GITBRANCH:=$(shell git rev-parse --abbrev-ref HEAD) 32​GITBRANCH:=$(shell git rev-parse --abbrev-ref HEAD)
33TARGETDIST:=fc21 33​TARGETDIST:=fc21
34BUILDTARGET=fedora-21-x86_64 34​BUILDTARGET=fedora-21-x86_64
35COPRREPO=https://copr-be.cloud.fedoraproject.org/results/tflink/taskotron/fedora-21-x86_64 35​COPRREPO=https://copr-be.cloud.fedoraproject.org/results/tflink/taskotron/fedora-21-x86_64
36MOCKCHAINREPO=/var/tmp/taskotron-mockchain/repo 36​MOCKCHAINREPO=/var/tmp/taskotron-mockchain
37 37​
38test: $(VENV) 38​test: $(VENV)
39 sh -c "TEST='true' . $(VENV)/bin/activate; py.test --cov $(SRC) testing/; deactivate" 39​ sh -c "TEST='true' . $(VENV)/bin/activate; py.test --cov $(SRC) testing/; deactivate"
40 40​
41test-ci: $(VENV) 41​test-ci: $(VENV)
42 sh -c "TEST='true' . $(VENV)/bin/activate; py.test --cov-report xml --cov $(SRC) testing/; deactivate" 42​ sh -c "TEST='true' . $(VENV)/bin/activate; py.test --cov-report xml --cov $(SRC) testing/; deactivate"
43 43​
44pylint: 44​pylint:
Show All 40 Lines
85cleanvenv: 85​cleanvenv:
86 rm -rf $(VENV) 86​ rm -rf $(VENV)
87 87​
88virtualenv: $(VENV) 88​virtualenv: $(VENV)
89 89​
90$(VENV): 90​$(VENV):
91 virtualenv --distribute --system-site-packages $(VENV) 91​ virtualenv --distribute --system-site-packages $(VENV)
92 sh -c ". $(VENV)/bin/activate; pip install --force-reinstall -r requirements.txt; deactivate" 92​ sh -c ". $(VENV)/bin/activate; pip install --force-reinstall -r requirements.txt; deactivate"
93 ​