forked from ungleich-public/cdist
Merge branch 'fix/ci' into 'master'
Make the pipeline green again See merge request ungleich-public/cdist!954
This commit is contained in:
commit
ac31e95ec0
7 changed files with 29 additions and 24 deletions
|
@ -1,20 +1,23 @@
|
|||
---
|
||||
image: code.ungleich.ch:5050/ungleich-public/cdist/cdist-ci:latest
|
||||
|
||||
stages:
|
||||
- test
|
||||
|
||||
image: code.ungleich.ch:5050/ungleich-public/cdist/cdist-ci:latest
|
||||
before_script:
|
||||
- ./bin/cdist-build-helper version
|
||||
|
||||
unit_tests:
|
||||
shellcheck:
|
||||
stage: test
|
||||
script:
|
||||
- ./bin/cdist-build-helper version
|
||||
- ./bin/cdist-build-helper test
|
||||
- ./bin/cdist-build-helper shellcheck
|
||||
|
||||
pycodestyle:
|
||||
stage: test
|
||||
script:
|
||||
- ./bin/cdist-build-helper pycodestyle
|
||||
|
||||
shellcheck:
|
||||
unit_tests:
|
||||
stage: test
|
||||
script:
|
||||
- ./bin/cdist-build-helper shellcheck
|
||||
- ./bin/cdist-build-helper test
|
||||
|
|
|
@ -45,7 +45,7 @@ usage() {
|
|||
shellcheck-manifests
|
||||
shellcheck-local-gencodes
|
||||
shellcheck-remote-gencodes
|
||||
shellcheck-scripts
|
||||
shellcheck-bin
|
||||
shellcheck-gencodes
|
||||
shellcheck-types
|
||||
shellcheck
|
||||
|
@ -100,7 +100,7 @@ case "$option" in
|
|||
if (\$0 ~ /^$end/) {
|
||||
exit
|
||||
} else {
|
||||
print \$0
|
||||
print \$0
|
||||
}
|
||||
}
|
||||
}" "$basedir/docs/changelog"
|
||||
|
@ -135,7 +135,7 @@ case "$option" in
|
|||
|
||||
version=$1; shift
|
||||
|
||||
(
|
||||
(
|
||||
cat << eof
|
||||
Subject: cdist $version has been released
|
||||
|
||||
|
@ -336,7 +336,7 @@ eof
|
|||
make docs-clean
|
||||
make docs
|
||||
|
||||
#############################################################
|
||||
#############################################################
|
||||
# Everything green, let's do the release
|
||||
|
||||
# Tag the current commit
|
||||
|
@ -405,7 +405,7 @@ eof
|
|||
;;
|
||||
|
||||
pycodestyle|pep8)
|
||||
pycodestyle "${basedir}" "${basedir}/scripts/cdist"
|
||||
pycodestyle "${basedir}" "${basedir}/bin/cdist"
|
||||
;;
|
||||
|
||||
check-pycodestyle)
|
||||
|
@ -460,9 +460,10 @@ eof
|
|||
test ! -s "${SHELLCHECKTMP}" || { cat "${SHELLCHECKTMP}"; exit 1; }
|
||||
;;
|
||||
|
||||
shellcheck-scripts)
|
||||
# NOTE: shellcheck-scripts is kept for compatibility
|
||||
shellcheck-bin|shellcheck-scripts)
|
||||
# shellcheck disable=SC2086
|
||||
${SHELLCHECKCMD} scripts/cdist-dump scripts/cdist-new-type > "${SHELLCHECKTMP}"
|
||||
${SHELLCHECKCMD} bin/cdist-dump bin/cdist-new-type > "${SHELLCHECKTMP}"
|
||||
test ! -s "${SHELLCHECKTMP}" || { cat "${SHELLCHECKTMP}"; exit 1; }
|
||||
;;
|
||||
|
||||
|
@ -480,7 +481,7 @@ eof
|
|||
shellcheck)
|
||||
"$0" shellcheck-global-explorers || exit 1
|
||||
"$0" shellcheck-types || exit 1
|
||||
"$0" shellcheck-scripts || exit 1
|
||||
"$0" shellcheck-bin || exit 1
|
||||
;;
|
||||
|
||||
shellcheck-type-files)
|
||||
|
|
|
@ -33,14 +33,15 @@ try:
|
|||
import cdist.version
|
||||
VERSION = cdist.version.VERSION
|
||||
except ModuleNotFoundError:
|
||||
cdist_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))
|
||||
cdist_dir = os.path.abspath(
|
||||
os.path.join(os.path.dirname(__file__), os.pardir))
|
||||
if os.path.isdir(os.path.join(cdist_dir, '.git')):
|
||||
try:
|
||||
VERSION = subprocess.check_output(
|
||||
['git', 'describe', '--always'],
|
||||
cwd=cdist_dir,
|
||||
universal_newlines=True)
|
||||
except:
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
BANNER = """
|
||||
|
|
|
@ -120,17 +120,18 @@ class Emulator:
|
|||
level = logging.WARNING
|
||||
else:
|
||||
level = logging.WARNING
|
||||
self.log = logging.getLogger(self.target_host[0])
|
||||
try:
|
||||
logging.root.setLevel(level)
|
||||
self.log.setLevel(level)
|
||||
except (ValueError, TypeError):
|
||||
# if invalid __cdist_log_level value
|
||||
logging.root.setLevel(logging.WARNING)
|
||||
self.log.setLevel(logging.WARNING)
|
||||
|
||||
colored_log = self.env.get('__cdist_colored_log', 'false')
|
||||
cdist.log.CdistFormatter.USE_COLORS = colored_log == 'true'
|
||||
|
||||
self.log = logging.getLogger(self.target_host[0])
|
||||
|
||||
def commandline(self):
|
||||
"""Parse command line"""
|
||||
|
||||
|
|
|
@ -54,13 +54,12 @@ _mydir = os.path.dirname(__file__)
|
|||
def find_cdist_exec():
|
||||
"""Search cdist executable starting from local lib directory.
|
||||
|
||||
Detect if ../scripts/cdist (from local lib direcotry) exists and
|
||||
Detect if ../bin/cdist (from local lib directory) exists and
|
||||
if it is executable. If not then try to find cdist exec path in
|
||||
os.get_exec_path() entries. If no cdist path is found rasie
|
||||
cdist.Error.
|
||||
"""
|
||||
cdist_path = os.path.abspath(os.path.join(_mydir, '..', 'scripts',
|
||||
'cdist'))
|
||||
cdist_path = os.path.abspath(os.path.join(_mydir, '..', 'bin', 'cdist'))
|
||||
if os.access(cdist_path, os.X_OK):
|
||||
return cdist_path
|
||||
cdist_path = find_cdist_exec_in_path()
|
||||
|
|
|
@ -26,7 +26,7 @@ import tempfile
|
|||
cdist_base_path = os.path.abspath(
|
||||
os.path.join(os.path.dirname(os.path.realpath(__file__)), "../../"))
|
||||
|
||||
cdist_exec_path = os.path.join(cdist_base_path, "scripts/cdist")
|
||||
cdist_exec_path = os.path.join(cdist_base_path, "bin/cdist")
|
||||
|
||||
global_fixtures_dir = os.path.abspath(os.path.join(os.path.dirname(__file__),
|
||||
"fixtures"))
|
||||
|
|
|
@ -202,7 +202,7 @@ class ConfigRunTestCase(test.CdistTestCase):
|
|||
host_dir_name=self.hostdir,
|
||||
# exec_path can not derivated from sys.argv in case of unittest
|
||||
exec_path=os.path.abspath(os.path.join(
|
||||
my_dir, '../../../scripts/cdist')),
|
||||
my_dir, '../../../bin/cdist')),
|
||||
initial_manifest=os.path.join(fixtures,
|
||||
'manifest/dryrun_manifest'),
|
||||
add_conf_dirs=[fixtures])
|
||||
|
@ -219,7 +219,7 @@ class ConfigRunTestCase(test.CdistTestCase):
|
|||
base_root_path=self.host_base_path,
|
||||
host_dir_name=self.hostdir,
|
||||
exec_path=os.path.abspath(os.path.join(
|
||||
my_dir, '../../../scripts/cdist')),
|
||||
my_dir, '../../../bin/cdist')),
|
||||
initial_manifest=os.path.join(
|
||||
fixtures, 'manifest/init-deps-resolver'),
|
||||
add_conf_dirs=[fixtures])
|
||||
|
|
Loading…
Reference in a new issue