summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xproxy.sh6
-rw-r--r--setup.py1
-rw-r--r--tox.ini1
-rw-r--r--zuul.d/ironic-python-agent-jobs.yaml1
4 files changed, 2 insertions, 7 deletions
diff --git a/proxy.sh b/proxy.sh
deleted file mode 100755
index 87af438b..00000000
--- a/proxy.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Have things work for users who didn't run with the
-# imagebuild/coreos/docker_build.bash script
-
-$*
diff --git a/setup.py b/setup.py
index cd35c3c3..31d6ada1 100644
--- a/setup.py
+++ b/setup.py
@@ -17,4 +17,5 @@ import setuptools
setuptools.setup(
setup_requires=['pbr>=2.0.0'],
+ py_modules=[],
pbr=True)
diff --git a/tox.ini b/tox.ini
index c3006ab1..5863ec89 100644
--- a/tox.ini
+++ b/tox.ini
@@ -44,6 +44,7 @@ deps =
pycodestyle>=2.0.0,<3.0.0 # MIT
doc8>=0.8.1 # Apache-2.0
allowlist_externals = bash
+ {toxinidir}/tools/run_bashate.sh
commands =
flake8 {posargs:ironic_python_agent examples}
# Run bashate during pep8 runs to ensure violations are caught by
diff --git a/zuul.d/ironic-python-agent-jobs.yaml b/zuul.d/ironic-python-agent-jobs.yaml
index 3e06c8c0..819e57d8 100644
--- a/zuul.d/ironic-python-agent-jobs.yaml
+++ b/zuul.d/ironic-python-agent-jobs.yaml
@@ -21,7 +21,6 @@
devstack_localrc:
IRONIC_BUILD_DEPLOY_RAMDISK: True
IRONIC_VM_COUNT: 2
- IRONIC_VM_SPECS_RAM: 2750
# This matches the default in ironic-base, specifying for clarity
IRONIC_RAMDISK_TYPE: dib
devstack_services: