X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/09a78e1ca2f46744f6a7178a7bf9629db780bf67..b9aae98b6fd18ce91e10ca64a7c83aabf064efb0:/Makefile.am diff --git a/Makefile.am b/Makefile.am index 998b7f4..b109e5b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,6 +20,9 @@ strip_hsroot = $(patsubst src/%,%,$(patsubst test/hs/%,%,$(1))) # Use bash in order to be able to use pipefail SHELL=/bin/bash +# Enable colors in shelltest +SHELLTESTARGS = "-c" + ACLOCAL_AMFLAGS = -I autotools BUILD_BASH_COMPLETION = $(top_srcdir)/autotools/build-bash-completion RUN_IN_TEMPDIR = $(top_srcdir)/autotools/run-in-tempdir @@ -40,8 +43,9 @@ SHELL_ENV_INIT = autotools/shell-env-init # Note: these are automake-specific variables, and must be named after # the directory + 'dir' suffix clientdir = $(pkgpythondir)/client +cmdlibdir = $(pkgpythondir)/cmdlib hypervisordir = $(pkgpythondir)/hypervisor -blockdir = $(pkgpythondir)/block +storagedir = $(pkgpythondir)/storage httpdir = $(pkgpythondir)/http masterddir = $(pkgpythondir)/masterd confddir = $(pkgpythondir)/confd @@ -62,8 +66,6 @@ myexeclibdir = $(pkglibdir) HS_DIRS = \ src \ src/Ganeti \ - src/Ganeti/Block \ - src/Ganeti/Block/Drbd \ src/Ganeti/Confd \ src/Ganeti/Curl \ src/Ganeti/DataCollectors \ @@ -74,11 +76,17 @@ HS_DIRS = \ src/Ganeti/Hypervisor/Xen \ src/Ganeti/Monitoring \ src/Ganeti/Query \ + src/Ganeti/Storage \ + src/Ganeti/Storage/Diskstats \ + src/Ganeti/Storage/Drbd \ + src/Ganeti/Storage/Lvm \ test/hs \ test/hs/Test \ test/hs/Test/Ganeti \ - test/hs/Test/Ganeti/Block \ - test/hs/Test/Ganeti/Block/Drbd \ + test/hs/Test/Ganeti/Storage \ + test/hs/Test/Ganeti/Storage/Diskstats \ + test/hs/Test/Ganeti/Storage/Drbd \ + test/hs/Test/Ganeti/Storage/Lvm \ test/hs/Test/Ganeti/Confd \ test/hs/Test/Ganeti/HTools \ test/hs/Test/Ganeti/HTools/Backend \ @@ -103,17 +111,19 @@ DIRS = \ test/data/htools \ test/data/htools/rapi \ test/hs/shelltests \ + test/autotools \ lib \ lib/build \ lib/client \ + lib/cmdlib \ lib/confd \ lib/http \ lib/hypervisor \ - lib/block \ lib/impexpd \ lib/masterd \ lib/rapi \ lib/server \ + lib/storage \ lib/tools \ lib/utils \ lib/watcher \ @@ -192,6 +202,8 @@ CLEANFILES = \ $(man_MANS) \ $(manhtml) \ tools/kvm-ifup \ + tools/vif-ganeti \ + tools/net-common \ tools/users-setup \ tools/vcluster-setup \ stamp-directories \ @@ -200,6 +212,7 @@ CLEANFILES = \ $(HS_ALL_PROGS) $(HS_BUILT_SRCS) \ $(HS_BUILT_TEST_HELPERS) \ src/ganeti-confd \ + src/ganeti-luxid \ src/ganeti-mond \ .hpc/*.mix src/*.tix test/hs/*.tix \ doc/hs-lint.html @@ -213,7 +226,7 @@ HS_GENERATED_FILES = if WANT_HTOOLS HS_GENERATED_FILES += $(HS_PROGS) if ENABLE_CONFD -HS_GENERATED_FILES += src/hconfd src/ganeti-confd +HS_GENERATED_FILES += src/hconfd src/ganeti-confd src/hluxid src/ganeti-luxid endif if ENABLE_MOND @@ -242,6 +255,7 @@ BUILT_EXAMPLES = \ doc/examples/ganeti-kvm-poweroff.initd \ doc/examples/ganeti.cron \ doc/examples/ganeti.initd \ + doc/examples/ganeti.logrotate \ doc/examples/ganeti-master-role.ocf \ doc/examples/ganeti-node-role.ocf \ doc/examples/gnt-config-backup \ @@ -261,12 +275,12 @@ pkgpython_PYTHON = \ lib/backend.py \ lib/bootstrap.py \ lib/cli.py \ - lib/cmdlib.py \ lib/compat.py \ lib/config.py \ lib/constants.py \ lib/daemon.py \ lib/errors.py \ + lib/hooksmaster.py \ lib/ht.py \ lib/jqueue.py \ lib/jstore.py \ @@ -287,7 +301,6 @@ pkgpython_PYTHON = \ lib/serializer.py \ lib/ssconf.py \ lib/ssh.py \ - lib/storage.py \ lib/uidpool.py \ lib/vcluster.py \ lib/network.py \ @@ -306,6 +319,27 @@ client_PYTHON = \ lib/client/gnt_os.py \ lib/client/gnt_storage.py +cmdlib_PYTHON = \ + lib/cmdlib/__init__.py \ + lib/cmdlib/backup.py \ + lib/cmdlib/base.py \ + lib/cmdlib/cluster.py \ + lib/cmdlib/common.py \ + lib/cmdlib/group.py \ + lib/cmdlib/instance.py \ + lib/cmdlib/instance_migration.py \ + lib/cmdlib/instance_operation.py \ + lib/cmdlib/instance_query.py \ + lib/cmdlib/instance_storage.py \ + lib/cmdlib/instance_utils.py \ + lib/cmdlib/misc.py \ + lib/cmdlib/network.py \ + lib/cmdlib/node.py \ + lib/cmdlib/operating_system.py \ + lib/cmdlib/query.py \ + lib/cmdlib/tags.py \ + lib/cmdlib/test.py + hypervisor_PYTHON = \ lib/hypervisor/__init__.py \ lib/hypervisor/hv_base.py \ @@ -315,13 +349,15 @@ hypervisor_PYTHON = \ lib/hypervisor/hv_lxc.py \ lib/hypervisor/hv_xen.py -block_PYTHON = \ - lib/block/__init__.py \ - lib/block/bdev.py \ - lib/block/base.py \ - lib/block/drbd.py \ - lib/block/drbd_info.py \ - lib/block/drbd_cmdgen.py +storage_PYTHON = \ + lib/storage/__init__.py \ + lib/storage/bdev.py \ + lib/storage/base.py \ + lib/storage/container.py \ + lib/storage/drbd.py \ + lib/storage/drbd_info.py \ + lib/storage/drbd_cmdgen.py \ + lib/storage/filestorage.py rapi_PYTHON = \ lib/rapi/__init__.py \ @@ -399,6 +435,7 @@ docinput = \ doc/design-2.5.rst \ doc/design-2.6.rst \ doc/design-2.7.rst \ + doc/design-2.8.rst \ doc/design-autorepair.rst \ doc/design-bulk-create.rst \ doc/design-chained-jobs.rst \ @@ -408,6 +445,7 @@ docinput = \ doc/design-htools-2.3.rst \ doc/design-http-server.rst \ doc/design-impexp2.rst \ + doc/design-internal-shutdown.rst \ doc/design-lu-generated-jobs.rst \ doc/design-linuxha.rst \ doc/design-multi-reloc.rst \ @@ -437,6 +475,7 @@ docinput = \ doc/install.rst \ doc/locking.rst \ doc/manpages-disabled.rst \ + doc/monitoring-query-format.rst \ doc/move-instance.rst \ doc/news.rst \ doc/ovfconverter.rst \ @@ -453,12 +492,17 @@ mandocrst = $(addprefix doc/man-,$(notdir $(manrst))) HS_BIN_PROGS=src/htools # Haskell programs to be installed in the MYEXECLIB dir +if ENABLE_MOND HS_MYEXECLIB_PROGS=src/mon-collector +else +HS_MYEXECLIB_PROGS= +endif # Haskell programs to be compiled by "make really-all" HS_COMPILE_PROGS= \ src/ganeti-mond \ src/hconfd \ + src/hluxid \ src/rpc-test # All Haskell non-test programs to be compiled but not automatically installed @@ -501,20 +545,24 @@ HPCEXCL = --exclude Main \ $(patsubst src.%,--exclude Test.%,$(subst /,.,$(patsubst %.hs,%, $(HS_LIB_SRCS)))) HS_LIB_SRCS = \ - src/Ganeti/Block/Drbd/Types.hs \ - src/Ganeti/Block/Drbd/Parser.hs \ src/Ganeti/BasicTypes.hs \ src/Ganeti/Common.hs \ src/Ganeti/Compat.hs \ src/Ganeti/Confd/Client.hs \ + src/Ganeti/Confd/ClientFunctions.hs \ src/Ganeti/Confd/Server.hs \ src/Ganeti/Confd/Types.hs \ src/Ganeti/Confd/Utils.hs \ src/Ganeti/Config.hs \ + src/Ganeti/ConfigReader.hs \ src/Ganeti/Curl/Multi.hs \ src/Ganeti/Daemon.hs \ src/Ganeti/DataCollectors/CLI.hs \ + src/Ganeti/DataCollectors/Diskstats.hs \ src/Ganeti/DataCollectors/Drbd.hs \ + src/Ganeti/DataCollectors/InstStatus.hs \ + src/Ganeti/DataCollectors/InstStatusTypes.hs \ + src/Ganeti/DataCollectors/Lv.hs \ src/Ganeti/DataCollectors/Program.hs \ src/Ganeti/DataCollectors/Types.hs \ src/Ganeti/Errors.hs \ @@ -531,6 +579,7 @@ HS_LIB_SRCS = \ src/Ganeti/HTools/Group.hs \ src/Ganeti/HTools/Instance.hs \ src/Ganeti/HTools/Loader.hs \ + src/Ganeti/HTools/Nic.hs \ src/Ganeti/HTools/Node.hs \ src/Ganeti/HTools/PeerMap.hs \ src/Ganeti/HTools/Program/Hail.hs \ @@ -543,6 +592,7 @@ HS_LIB_SRCS = \ src/Ganeti/HTools/Program/Hroller.hs \ src/Ganeti/HTools/Program/Main.hs \ src/Ganeti/HTools/Types.hs \ + src/Ganeti/Hypervisor/Xen.hs \ src/Ganeti/Hypervisor/Xen/XmParser.hs \ src/Ganeti/Hypervisor/Xen/Types.hs \ src/Ganeti/Hash.hs \ @@ -557,6 +607,7 @@ HS_LIB_SRCS = \ src/Ganeti/OpCodes.hs \ src/Ganeti/OpParams.hs \ src/Ganeti/Path.hs \ + src/Ganeti/Query/Cluster.hs \ src/Ganeti/Query/Common.hs \ src/Ganeti/Query/Export.hs \ src/Ganeti/Query/Filter.hs \ @@ -571,6 +622,13 @@ HS_LIB_SRCS = \ src/Ganeti/Rpc.hs \ src/Ganeti/Runtime.hs \ src/Ganeti/Ssconf.hs \ + src/Ganeti/Storage/Diskstats/Parser.hs \ + src/Ganeti/Storage/Diskstats/Types.hs \ + src/Ganeti/Storage/Drbd/Parser.hs \ + src/Ganeti/Storage/Drbd/Types.hs \ + src/Ganeti/Storage/Lvm/LVParser.hs \ + src/Ganeti/Storage/Lvm/Types.hs \ + src/Ganeti/Storage/Utils.hs \ src/Ganeti/THH.hs \ src/Ganeti/Types.hs \ src/Ganeti/Utils.hs @@ -578,8 +636,6 @@ HS_LIB_SRCS = \ HS_TEST_SRCS = \ test/hs/Test/Ganeti/Attoparsec.hs \ test/hs/Test/Ganeti/BasicTypes.hs \ - test/hs/Test/Ganeti/Block/Drbd/Parser.hs \ - test/hs/Test/Ganeti/Block/Drbd/Types.hs \ test/hs/Test/Ganeti/Common.hs \ test/hs/Test/Ganeti/Confd/Types.hs \ test/hs/Test/Ganeti/Confd/Utils.hs \ @@ -611,6 +667,10 @@ HS_TEST_SRCS = \ test/hs/Test/Ganeti/Rpc.hs \ test/hs/Test/Ganeti/Runtime.hs \ test/hs/Test/Ganeti/Ssconf.hs \ + test/hs/Test/Ganeti/Storage/Diskstats/Parser.hs \ + test/hs/Test/Ganeti/Storage/Drbd/Parser.hs \ + test/hs/Test/Ganeti/Storage/Drbd/Types.hs \ + test/hs/Test/Ganeti/Storage/Lvm/LVParser.hs \ test/hs/Test/Ganeti/THH.hs \ test/hs/Test/Ganeti/TestCommon.hs \ test/hs/Test/Ganeti/TestHTools.hs \ @@ -721,14 +781,17 @@ endif # Things to build but not to install (add it to EXTRA_DIST if it should be # distributed) noinst_DATA = \ - doc/html \ $(BUILT_EXAMPLES) \ doc/examples/bash_completion \ doc/examples/bash_completion-debug \ $(manhtml) +if HAS_SPHINX if MANPAGES_IN_DOC noinst_DATA += doc/man-html +else +noinst_DATA += doc/html +endif endif gnt_scripts = \ @@ -768,7 +831,9 @@ qa_scripts = \ qa/qa_error.py \ qa/qa_group.py \ qa/qa_instance.py \ + qa/qa_instance_utils.py \ qa/qa_job.py \ + qa/qa_monitoring.py \ qa/qa_node.py \ qa/qa_os.py \ qa/qa_rapi.py \ @@ -812,7 +877,7 @@ test/hs/hpc-htools: HEXTRA_INT=-fhpc test/hs/hpc-mon-collector: HEXTRA_INT=-fhpc # test dependency -test/hs/offline-tests.sh: test/hs/hpc-htools test/hs/hpc-mon-collector +test/hs/offline-test.sh: test/hs/hpc-htools test/hs/hpc-mon-collector # rules for building profiling-enabled versions of the haskell # programs: hs-prof does the full two-step build, whereas @@ -847,7 +912,11 @@ if ENABLE_CONFD src/ganeti-confd: src/hconfd cp -f $< $@ +src/ganeti-luxid: src/hluxid + cp -f $< $@ + nodist_sbin_SCRIPTS += src/ganeti-confd +nodist_sbin_SCRIPTS += src/ganeti-luxid endif if ENABLE_MOND @@ -893,6 +962,8 @@ nodist_pkglib_python_scripts = \ myexeclib_SCRIPTS = \ daemons/daemon-util \ tools/kvm-ifup \ + tools/vif-ganeti \ + tools/net-common \ $(pkglib_python_scripts) \ $(HS_MYEXECLIB_PROGS) @@ -928,6 +999,8 @@ EXTRA_DIST = \ devel/upload \ devel/webserver \ tools/kvm-ifup.in \ + tools/vif-ganeti.in \ + tools/net-common.in \ tools/users-setup.in \ tools/vcluster-setup.in \ $(docinput) \ @@ -959,6 +1032,7 @@ EXTRA_DIST = \ man_MANS = \ man/ganeti-cleaner.8 \ man/ganeti-confd.8 \ + man/ganeti-luxid.8 \ man/ganeti-listrunner.8 \ man/ganeti-masterd.8 \ man/ganeti-mond.8 \ @@ -979,6 +1053,7 @@ man_MANS = \ man/gnt-os.8 \ man/gnt-storage.8 \ man/hail.1 \ + man/harep.1 \ man/hbal.1 \ man/hcheck.1 \ man/hinfo.1 \ @@ -1000,11 +1075,15 @@ maninput = \ $(mangen) TEST_FILES = \ + test/autotools/autotools-check-news.test \ test/data/htools/clean-nonzero-score.data \ test/data/htools/common-suffix.data \ test/data/htools/empty-cluster.data \ test/data/htools/hail-alloc-drbd.json \ + test/data/htools/hail-alloc-invalid-network.json \ test/data/htools/hail-alloc-invalid-twodisks.json \ + test/data/htools/hail-alloc-restricted-network.json \ + test/data/htools/hail-alloc-spindles.json \ test/data/htools/hail-alloc-twodisks.json \ test/data/htools/hail-change-group.json \ test/data/htools/hail-invalid-reloc.json \ @@ -1012,14 +1091,27 @@ TEST_FILES = \ test/data/htools/hail-reloc-drbd.json \ test/data/htools/hbal-excl-tags.data \ test/data/htools/hbal-split-insts.data \ + test/data/htools/hspace-tiered-dualspec-exclusive.data \ + test/data/htools/hspace-tiered-dualspec.data \ + test/data/htools/hspace-tiered-exclusive.data \ + test/data/htools/hspace-tiered-ipolicy.data \ + test/data/htools/hspace-tiered-mixed.data \ + test/data/htools/hspace-tiered-resourcetypes.data \ + test/data/htools/hspace-tiered-vcpu.data \ + test/data/htools/hspace-tiered.data \ test/data/htools/invalid-node.data \ test/data/htools/missing-resources.data \ test/data/htools/multiple-master.data \ + test/data/htools/multiple-tags.data \ test/data/htools/n1-failure.data \ test/data/htools/rapi/groups.json \ test/data/htools/rapi/info.json \ test/data/htools/rapi/instances.json \ test/data/htools/rapi/nodes.json \ + test/data/htools/hroller-full.data \ + test/data/htools/hroller-nodegroups.data \ + test/data/htools/hroller-nonredundant.data \ + test/data/htools/hroller-online.data \ test/data/htools/unique-reboot-order.data \ test/hs/shelltests/htools-balancing.test \ test/hs/shelltests/htools-basic.test \ @@ -1038,6 +1130,7 @@ TEST_FILES = \ test/data/bdev-drbd-8.0.txt \ test/data/bdev-drbd-8.3.txt \ test/data/bdev-drbd-8.4.txt \ + test/data/bdev-drbd-8.4-no-disk-params.txt \ test/data/bdev-drbd-disk.txt \ test/data/bdev-drbd-net-ip4.txt \ test/data/bdev-drbd-net-ip6.txt \ @@ -1055,7 +1148,10 @@ TEST_FILES = \ test/data/bdev-rbd/output_invalid.txt \ test/data/cert1.pem \ test/data/cert2.pem \ + test/data/cluster_config_2.7.json \ + test/data/cluster_config_2.8.json \ test/data/instance-minor-pairing.txt \ + test/data/instance-prim-sec.txt \ test/data/ip-addr-show-dummy0.txt \ test/data/ip-addr-show-lo-ipv4.txt \ test/data/ip-addr-show-lo-ipv6.txt \ @@ -1069,6 +1165,9 @@ TEST_FILES = \ test/data/kvm_0.9.1_help_boot_test.txt \ test/data/kvm_1.0_help.txt \ test/data/kvm_1.1.2_help.txt \ + test/data/lvs_lv.txt \ + test/data/NEWS_OK.txt \ + test/data/NEWS_previous_unreleased.txt \ test/data/ovfdata/compr_disk.vmdk.gz \ test/data/ovfdata/config.ini \ test/data/ovfdata/corrupted_resources.ovf \ @@ -1094,6 +1193,7 @@ TEST_FILES = \ test/data/ovfdata/wrong_manifest.ovf \ test/data/ovfdata/wrong_ova.ova \ test/data/ovfdata/wrong_xml.ovf \ + test/data/proc_diskstats.txt \ test/data/proc_drbd8.txt \ test/data/proc_drbd80-emptyline.txt \ test/data/proc_drbd80-emptyversion.txt \ @@ -1119,6 +1219,7 @@ TEST_FILES = \ test/py/gnt-cli.test \ test/py/import-export_unittest-helper + python_tests = \ doc/examples/rapi_testutils.py \ test/py/cfgupgrade_unittest.py \ @@ -1126,12 +1227,14 @@ python_tests = \ test/py/ganeti.asyncnotifier_unittest.py \ test/py/ganeti.backend_unittest-runasroot.py \ test/py/ganeti.backend_unittest.py \ - test/py/ganeti.block.bdev_unittest.py \ + test/py/ganeti.bootstrap_unittest.py \ test/py/ganeti.cli_unittest.py \ test/py/ganeti.client.gnt_cluster_unittest.py \ test/py/ganeti.client.gnt_instance_unittest.py \ test/py/ganeti.client.gnt_job_unittest.py \ test/py/ganeti.cmdlib_unittest.py \ + test/py/ganeti.cmdlib.cluster_unittest.py \ + test/py/ganeti.cmdlib.instance_storage_unittest.py \ test/py/ganeti.compat_unittest.py \ test/py/ganeti.confd.client_unittest.py \ test/py/ganeti.config_unittest.py \ @@ -1173,7 +1276,10 @@ python_tests = \ test/py/ganeti.server.rapi_unittest.py \ test/py/ganeti.ssconf_unittest.py \ test/py/ganeti.ssh_unittest.py \ - test/py/ganeti.storage_unittest.py \ + test/py/ganeti.storage.bdev_unittest.py \ + test/py/ganeti.storage.container_unittest.py \ + test/py/ganeti.storage.drbd_unittest.py \ + test/py/ganeti.storage.filestorage_unittest.py \ test/py/ganeti.tools.burnin_unittest.py \ test/py/ganeti.tools.ensure_dirs_unittest.py \ test/py/ganeti.tools.node_daemon_setup_unittest.py \ @@ -1190,6 +1296,7 @@ python_tests = \ test/py/ganeti.utils.nodesetup_unittest.py \ test/py/ganeti.utils.process_unittest.py \ test/py/ganeti.utils.retry_unittest.py \ + test/py/ganeti.utils.storage_unittest.py \ test/py/ganeti.utils.text_unittest.py \ test/py/ganeti.utils.wrapper_unittest.py \ test/py/ganeti.utils.x509_unittest.py \ @@ -1208,8 +1315,11 @@ dist_TESTS = \ test/py/ganeti-cleaner_unittest.bash \ test/py/import-export_unittest.bash \ test/py/cli-test.bash \ - test/py/bash_completion.bash \ - $(python_tests) + test/py/bash_completion.bash + +if PY_UNIT +dist_TESTS += $(python_tests) +endif nodist_TESTS = check_SCRIPTS = @@ -1242,11 +1352,11 @@ all_python_code = \ $(pkglib_python_scripts) \ $(nodist_pkglib_python_scripts) \ $(nodist_tools_python_scripts) \ - $(python_tests) \ $(pkgpython_PYTHON) \ $(client_PYTHON) \ + $(cmdlib_PYTHON) \ $(hypervisor_PYTHON) \ - $(block_PYTHON) \ + $(storage_PYTHON) \ $(rapi_PYTHON) \ $(server_PYTHON) \ $(pytools_PYTHON) \ @@ -1259,6 +1369,10 @@ all_python_code = \ $(noinst_PYTHON) \ $(qa_scripts) +if PY_UNIT +all_python_code += $(python_tests) +endif + srclink_files = \ man/footer.rst \ test/py/check-cert-expired_unittest.bash \ @@ -1318,6 +1432,14 @@ tools/kvm-ifup: tools/kvm-ifup.in $(REPLACE_VARS_SED) sed -f $(REPLACE_VARS_SED) < $< > $@ chmod +x $@ +tools/vif-ganeti: tools/vif-ganeti.in $(REPLACE_VARS_SED) + sed -f $(REPLACE_VARS_SED) < $< > $@ + chmod +x $@ + +tools/net-common: tools/net-common.in $(REPLACE_VARS_SED) + sed -f $(REPLACE_VARS_SED) < $< > $@ + chmod +x $@ + tools/users-setup: tools/users-setup.in $(REPLACE_VARS_SED) sed -f $(REPLACE_VARS_SED) < $< > $@ chmod +x $@ @@ -1470,10 +1592,7 @@ lib/_autoconf.py: Makefile | stamp-directories echo "XEN_KERNEL = '$(XEN_KERNEL)'"; \ echo "XEN_INITRD = '$(XEN_INITRD)'"; \ echo "KVM_KERNEL = '$(KVM_KERNEL)'"; \ - echo "FILE_STORAGE_DIR = '$(FILE_STORAGE_DIR)'"; \ - echo "ENABLE_FILE_STORAGE = $(ENABLE_FILE_STORAGE)"; \ echo "SHARED_FILE_STORAGE_DIR = '$(SHARED_FILE_STORAGE_DIR)'"; \ - echo "ENABLE_SHARED_FILE_STORAGE = $(ENABLE_SHARED_FILE_STORAGE)"; \ echo "IALLOCATOR_SEARCH_PATH = [$(IALLOCATOR_SEARCH_PATH)]"; \ echo "KVM_PATH = '$(KVM_PATH)'"; \ echo "IP_PATH = '$(IP_PATH)'"; \ @@ -1496,6 +1615,8 @@ lib/_autoconf.py: Makefile | stamp-directories echo "RAPI_GROUP = '$(RAPI_GROUP)'"; \ echo "CONFD_USER = '$(CONFD_USER)'"; \ echo "CONFD_GROUP = '$(CONFD_GROUP)'"; \ + echo "LUXID_USER = '$(LUXID_USER)'"; \ + echo "LUXID_GROUP = '$(LUXID_GROUP)'"; \ echo "NODED_USER = '$(NODED_USER)'"; \ echo "NODED_GROUP = '$(NODED_GROUP)'"; \ echo "MOND_USER = '$(MOND_USER)'"; \ @@ -1571,17 +1692,18 @@ $(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories echo 's#@''CUSTOM_XEN_INITRD@#$(XEN_INITRD)#g'; \ echo 's#@''CUSTOM_IALLOCATOR_SEARCH_PATH@#$(IALLOCATOR_SEARCH_PATH)#g'; \ echo 's#@''CUSTOM_EXPORT_DIR@#$(EXPORT_DIR)#g'; \ - echo 's#@''RPL_FILE_STORAGE_DIR@#$(FILE_STORAGE_DIR)#g'; \ echo 's#@''RPL_SSH_INITD_SCRIPT@#$(SSH_INITD_SCRIPT)#g'; \ echo 's#@''PKGLIBDIR@#$(pkglibdir)#g'; \ echo 's#@''GNTMASTERUSER@#$(MASTERD_USER)#g'; \ echo 's#@''GNTRAPIUSER@#$(RAPI_USER)#g'; \ echo 's#@''GNTCONFDUSER@#$(CONFD_USER)#g'; \ + echo 's#@''GNTLUXIDUSER@#$(LUXID_USER)#g'; \ echo 's#@''GNTNODEDUSER@#$(NODED_USER)#g'; \ echo 's#@''GNTMONDUSER@#$(MOND_USER)#g'; \ echo 's#@''GNTRAPIGROUP@#$(RAPI_GROUP)#g'; \ echo 's#@''GNTADMINGROUP@#$(ADMIN_GROUP)#g'; \ echo 's#@''GNTCONFDGROUP@#$(CONFD_GROUP)#g'; \ + echo 's#@''GNTLUXIDGROUP@#$(LUXID_GROUP)#g'; \ echo 's#@''GNTMASTERDGROUP@#$(MASTERD_GROUP)#g'; \ echo 's#@''GNTMONDGROUP@#$(MOND_GROUP)#g'; \ echo 's#@''GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \ @@ -1690,30 +1812,32 @@ check-local: check-dirs $(GENERATED_FILES) $(CHECK_PYTHON_CODE) $(check_python_code) PYTHONPATH=. $(CHECK_HEADER) $(check_python_code) $(CHECK_VERSION) $(VERSION) $(top_srcdir)/NEWS - $(CHECK_NEWS) < $(top_srcdir)/NEWS + RELEASE=$(PACKAGE_VERSION) $(CHECK_NEWS) < $(top_srcdir)/NEWS PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(CHECK_IMPORTS) . $(standalone_python_modules) - @expver=$(VERSION_MAJOR).$(VERSION_MINOR); \ error= ; \ - if test "`head -n 1 $(top_srcdir)/README`" != "Ganeti $$expver"; then \ - echo "Incorrect version in README, expected $$expver" >&2; \ - error=1; \ - fi; \ - for file in doc/iallocator.rst doc/hooks.rst doc/virtual-cluster.rst \ - doc/security.rst; do \ - if test "`sed -ne '4 p' $(top_srcdir)/$$file`" != \ - "Documents Ganeti version $$expver"; then \ - echo "Incorrect version in $$file, expected $$expver" >&2; \ + if [ "x`echo $(VERSION_SUFFIX)|grep 'alpha'`" == "x" ]; then \ + expver=$(VERSION_MAJOR).$(VERSION_MINOR); \ + if test "`head -n 1 $(top_srcdir)/README`" != "Ganeti $$expver"; then \ + echo "Incorrect version in README, expected $$expver" >&2; \ + error=1; \ + fi; \ + for file in doc/iallocator.rst doc/hooks.rst doc/virtual-cluster.rst \ + doc/security.rst; do \ + if test "`sed -ne '4 p' $(top_srcdir)/$$file`" != \ + "Documents Ganeti version $$expver"; then \ + echo "Incorrect version in $$file, expected $$expver" >&2; \ + error=1; \ + fi; \ + done; \ + if ! test -f $(top_srcdir)/doc/design-$$expver.rst; then \ + echo "File $(top_srcdir)/doc/design-$$expver.rst not found" >&2; \ + error=1; \ + fi; \ + if test "`sed -ne '5 p' $(top_srcdir)/doc/design-draft.rst`" != \ + ".. Last updated for Ganeti $$expver"; then \ + echo "doc/design-draft.rst was not updated for version $$expver" >&2; \ error=1; \ fi; \ - done; \ - if ! test -f $(top_srcdir)/doc/design-$$expver.rst; then \ - echo "File $(top_srcdir)/doc/design-$$expver.rst not found" >&2; \ - error=1; \ - fi; \ - if test "`sed -ne '5 p' $(top_srcdir)/doc/design-draft.rst`" != \ - ".. Last updated for Ganeti $$expver"; then \ - echo "doc/design-draft.rst was not updated for version $$expver" >&2; \ - error=1; \ fi; \ for file in configure.ac $(HS_LIBTEST_SRCS) $(HS_PROG_SRCS); do \ if test $$(wc --max-line-length < $(top_srcdir)/$$file) -gt 80; then \ @@ -1723,15 +1847,30 @@ check-local: check-dirs $(GENERATED_FILES) done; \ test -z "$$error" +.PHONY: hs-test-% +hs-test-%: test/hs/htest | $(BUILT_PYTHON_SOURCES) + @rm -f htest.tix + test/hs/htest -t $* + .PHONY: hs-tests hs-tests: test/hs/htest | $(BUILT_PYTHON_SOURCES) @rm -f htest.tix ./test/hs/htest +.PHONY: hs-shell-% +hs-shell-%: test/hs/hpc-htools test/hs/hpc-mon-collector \ + $(HS_BUILT_TEST_HELPERS) + @rm -f hpc-htools.tix hpc-mon-collector.tix + HBINARY="./test/hs/hpc-htools" \ + SHELLTESTARGS=$(SHELLTESTARGS) \ + ./test/hs/offline-test.sh $* + .PHONY: hs-shell hs-shell: test/hs/hpc-htools test/hs/hpc-mon-collector $(HS_BUILT_TEST_HELPERS) @rm -f hpc-htools.tix hpc-mon-collector.tix - HBINARY="./test/hs/hpc-htools" ./test/hs/offline-test.sh + HBINARY="./test/hs/hpc-htools" \ + SHELLTESTARGS=$(SHELLTESTARGS) \ + ./test/hs/offline-test.sh .PHONY: hs-check hs-check: hs-tests hs-shell @@ -1831,18 +1970,12 @@ distcheck-hook: echo "Found empty files or directories in final archive." 1>&2; \ exit 1; \ fi - if test -n "$(BUILD_RELEASE)" && \ - grep -n -H -E '^\*.*unreleased' $(top_distdir)/NEWS; then \ - echo "Found unreleased version in NEWS." >&2; \ - exit 1; \ - fi if test -e $(top_distdir)/doc/man-html; then \ echo "Found documentation including man pages in final archive" >&2; \ exit 1; \ fi -# When building a release, stricter checks should be used -distcheck-release dist-release: export BUILD_RELEASE = 1 +# Backwards compatible distcheck-release target distcheck-release: distcheck distrebuildcheck: dist @@ -1933,12 +2066,17 @@ TAGS: $(GENERATED_FILES) etags -l python -a - .PHONY: coverage + +COVERAGE_TESTS= if WANT_HTOOLS -coverage: py-coverage hs-coverage -else -coverage: py-coverage +COVERAGE_TESTS += hs-coverage +endif +if PY_UNIT +COVERAGE_TESTS += py-coverage endif +coverage: $(COVERAGE_TESTS) + .PHONY: py-coverage py-coverage: $(GENERATED_FILES) $(python_tests) @test -n "$(PYCOVERAGE)" || \ @@ -1979,7 +2117,12 @@ live-test: all --srcdir=.. $(HPCEXCL) ; \ hpc report --srcdir=.. live-test $(HPCEXCL) -commit-check: distcheck lint apidoc +commit-check: autotools-check distcheck lint apidoc + +autotools-check: + TESTDATA_DIR=./test/data shelltest $(SHELLTESTARGS) \ + $(abs_top_srcdir)/test/autotools/*-*.test \ + -- --hide-successes .PHONY: gitignore-check gitignore-check: