Manually merged PR77 (part II); missing envhelp and Makefile changes

git-svn-id: svn+ssh://svn.code.sf.net/p/migrid/code/trunk@6098 b75ad72c-e7d7-11dd-a971-7dbc132099af

Author: jonasbardino

Makefile

@@ -40,12 +40,23 @@ distclean: clean
 	@rm -f ./tests/*.pyc
 
 .PHONY: test
-test: dependencies
+test: dependencies testconfig
 	@$(PYTHON_BIN) -m unittest discover -s tests/
 
 .PHONY: dependencies
 dependencies: ./envhelp/venv/pyvenv.cfg ./envhelp/py3.depends
 
+.PHONY: testconfig
+testconfig: ./envhelp/output/testconfs
+
+./envhelp/output/testconfs:
+	@echo "generating test configuration"
+	@./envhelp/makeconfig test --python2
+	@./envhelp/makeconfig test
+	@mkdir -p ./envhelp/output/certs
+	@mkdir -p ./envhelp/output/state
+	@mkdir -p ./envhelp/output/state/log
+
 ifeq ($(MIG_ENV),'local')
 ./envhelp/py3.depends: $(REQS_PATH) local-requirements.txt
 else

envhelp/makeconfig

@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# --- BEGIN_HEADER ---
+#
+# makeconfig - standalone wrapper for generating a test configuration.
+# Copyright (C) 2003-2024  The MiG Project by the Science HPC Center at UCPH
+#
+# This file is part of MiG.
+#
+# MiG is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# MiG is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+# USA.
+#
+# --- END_HEADER ---
+#
+
+set -e
+
+SCRIPT_PATH=$(realpath "$0")
+SCRIPT_BASE=$(dirname -- "$SCRIPT_PATH")
+MIG_BASE=$(realpath "$SCRIPT_BASE/..")
+PYTHON_BIN=${PYTHON_BIN:-"$SCRIPT_BASE/venv/bin/python3"}
+PY=${PY:-'3'}
+
+# default PYTHONPATH such that importing files in the repo "just works"
+PYTHONPATH=${PYTHONPATH:-"$MIG_BASE"}
+
+# default any variables for local development
+MIG_ENV=${MIG_ENV:-'local'}
+
+MIG_ENV="$MIG_ENV" PY="$PY" "$PYTHON_BIN" "$SCRIPT_BASE/makeconfig.py" "$@"

envhelp/makeconfig.py

@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+#
+# --- BEGIN_HEADER ---
+#
+# makeconfig.py - standalone test configuration generation
+# Copyright (C) 2003-2024  The MiG Project by the Science HPC Center at UCPH
+#
+# This file is part of MiG.
+#
+# MiG is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# MiG is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+# USA.
+#
+# --- END_HEADER ---
+#
+
+"""Standalone test configuration generation."""
+
+
+from __future__ import print_function
+
+import os
+import sys
+
+sys.path.append(os.path.realpath(
+    os.path.join(os.path.dirname(__file__), "..")))
+
+from mig.shared.install import generate_confs
+
+_ENVHELP_OUTPUT_DIR = os.path.realpath(
+    os.path.join(os.path.dirname(__file__), "output"))
+_MAKECONFIG_ALLOWED = ["local", "test"]
+_PYTHON_MAJOR = os.environ.get('PY', '3')
+
+
+def _at(sequence, index=-1, default=None):
+    assert index > -1
+    try:
+        return sequence[index]
+    except IndexError:
+        return default
+
+
+def write_testconfig(env_name, is_py2=False):
+    confs_name = 'confs' if env_name == 'local' else '%sconfs' % (env_name,)
+    overrides = {
+        'destination': os.path.join(_ENVHELP_OUTPUT_DIR, confs_name),
+        'destination_suffix': "-py%s" % ('2' if is_py2 else '3',),
+    }
+    if is_py2:
+        overrides.update(**{
+            'mig_code': '/usr/src/app/mig',
+            'mig_certs': '/usr/src/app/envhelp/output/certs',
+            'mig_state': '/usr/src/app/envhelp/output/state',
+        })
+    generate_confs(_ENVHELP_OUTPUT_DIR, **overrides)
+
+
+def main_(argv):
+    env_name = _at(argv, index=1, default='')
+    arg_is_py2 = '--python2' in argv
+
+    if env_name == '':
+        raise RuntimeError(
+            'expected the environment name as a single argument')
+    if env_name not in _MAKECONFIG_ALLOWED:
+        raise RuntimeError('environment must be one of %s' %
+                           (_MAKECONFIG_ALLOWED,))
+
+    write_testconfig(env_name, is_py2=arg_is_py2)
+
+
+def main(argv=sys.argv):
+    try:
+        main_(argv)
+    except RuntimeError as e:
+        print('makeconfig: %s' % (str(e),))
+        exit(1)
+
+
+if __name__ == '__main__':
+    main()

envhelp/python2

@@ -1,6 +1,29 @@
 #!/bin/sh
 #
-# Wrap python2 docker container for testing
+# --- BEGIN_HEADER ---
+#
+# python2 - wrap python2 docker container for testing
+# Copyright (C) 2003-2024  The MiG Project by the Science HPC Center at UCPH
+#
+# This file is part of MiG.
+#
+# MiG is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# MiG is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+# USA.
+#
+# --- END_HEADER ---
+#
 
 set -e
 

envhelp/python3

@@ -1,6 +1,29 @@
 #!/bin/sh
 #
-# Wrap python3 virtual environment for testing
+# --- BEGIN_HEADER ---
+#
+# python3 - wrap python3 virtual environment for testing
+# Copyright (C) 2003-2024  The MiG Project by the Science HPC Center at UCPH
+#
+# This file is part of MiG.
+#
+# MiG is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# MiG is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+# USA.
+#
+# --- END_HEADER ---
+#
 
 set -e