Commit 8e9937b1 authored by Georges Racinet's avatar Georges Racinet 🦑
Browse files

Fixing flake8 and forcing the job in CI.

I *kwew* that this job not running on detached MR pipelines was
going to be a problem. We can live with duplication of that job.
parent dc52c1b69ea4
......@@ -10,6 +10,9 @@ flake8:
image: octobus/ci-py3
script:
- flake8 tests conftest.py
rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
- if: '$CI_PIPELINE_SOURCE == "push"'
.docker-remote:
stage: test-heptapod
......@@ -28,7 +31,8 @@ flake8:
- ci/run-tests
rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
- when: manual # default case
- if: '$CI_PIPELINE_SOURCE =~ "/.*"'
when: manual
docker-inside:
stage: test-heptapod
......
......@@ -156,7 +156,8 @@ def heptapod(pytestconfig):
# or to store on the Heptapod object (all tests use it), which creates
# confusion between the client and server sides.
hg.HG_EXECUTABLE = pytestconfig.getoption('heptapod_hg_client_executable')
git.GIT_EXECUTABLE = pytestconfig.getoption('heptapod_git_client_executable')
git.GIT_EXECUTABLE = pytestconfig.getoption(
'heptapod_git_client_executable')
url = pytestconfig.getoption('heptapod_url')
common = dict(
......
import subprocess
from .utils.git import LocalRepo as GitLocalRepo
from .utils.hg import LocalRepo
from .utils.project import ProjectAccess
......
......@@ -485,8 +485,8 @@ class OmnibusHeptapod(Heptapod):
ssh_url = 'ssh://git@localhost'
# TODO read from conf for logical dependency loosening.
# Not an immediate priority, since we're not concerned about Python 2 any more,
# see heptapod#353.
# Not an immediate priority, since we're not concerned about Python 2
# any more (see heptapod#353)
hg_executable = '/opt/gitlab/embedded/bin/hg'
chrome_driver_args = ('--no-sandbox', )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment