From 12d02fecfb1b7bb13d7373d3e2b819d04aba1226 Mon Sep 17 00:00:00 2001 From: Veiko Aasa Date: Tue, 9 Aug 2022 19:42:24 +0300 Subject: [PATCH] container: Ignore flake8 error 'line too long' in bash script text Also add container script to flake8 test in gitlab-ci. Signed-off-by: Veiko Aasa --- .gitlab-ci.yml | 2 +- container | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4da5bb988..b11199c70 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ code-quality: stage: test needs: [] script: - - python3 -m flake8 --exclude actions/domainname-change,actions/dynamicdns,actions/hostname-change,actions/networks plinth actions/* + - python3 -m flake8 --exclude actions/domainname-change,actions/dynamicdns,actions/hostname-change,actions/networks container plinth actions/* unit-tests: stage: test diff --git a/container b/container index de30e925d..b87b7947b 100755 --- a/container +++ b/container @@ -177,7 +177,7 @@ sudo chmod --recursive --silent a+w htmlcov sudo chmod --silent a+w .coverage exit 0 -''' +''' # noqa SETUP_AND_RUN_TESTS_SCRIPT = ''' set -x @@ -917,9 +917,8 @@ def _get_ssh_command(ip_address, distribution): return [ 'ssh', '-Y', '-C', '-t', '-i', str(public_key), '-o', 'LogLevel=error', '-o', - 'StrictHostKeyChecking=no', '-o', 'UserKnownHostsFile=/dev/null', - '-o', 'IdentitiesOnly=yes', - f'fbx@{ip_address}' + 'StrictHostKeyChecking=no', '-o', 'UserKnownHostsFile=/dev/null', '-o', + 'IdentitiesOnly=yes', f'fbx@{ip_address}' ]