MINIFICPP-391 Corrected MiNiFi/NiFi versions for integration tests This closes #256.
Signed-off-by: Marc Parisi <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/commit/5aa596fd Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/5aa596fd Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/5aa596fd Branch: refs/heads/master Commit: 5aa596fd88198446ac49d209a4b32dba44f9ffa9 Parents: ee00393 Author: Andrew I. Christianson <[email protected]> Authored: Wed Jan 31 15:02:27 2018 -0500 Committer: Marc Parisi <[email protected]> Committed: Thu Feb 1 13:51:36 2018 -0500 ---------------------------------------------------------------------- docker/DockerVerify.sh | 2 +- docker/test/integration/minifi/__init__.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/5aa596fd/docker/DockerVerify.sh ---------------------------------------------------------------------- diff --git a/docker/DockerVerify.sh b/docker/DockerVerify.sh index 99de193..0707a12 100755 --- a/docker/DockerVerify.sh +++ b/docker/DockerVerify.sh @@ -47,7 +47,7 @@ pip install --upgrade \ m2crypto \ watchdog -export MINIFI_VERSION=0.5.0 +export MINIFI_VERSION=0.4.0 export PYTHONPATH="${PYTHONPATH}:${docker_dir}/test/integration" exec pytest -s -v "${docker_dir}"/test/integration http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/5aa596fd/docker/test/integration/minifi/__init__.py ---------------------------------------------------------------------- diff --git a/docker/test/integration/minifi/__init__.py b/docker/test/integration/minifi/__init__.py index 9327ef5..ec71e74 100644 --- a/docker/test/integration/minifi/__init__.py +++ b/docker/test/integration/minifi/__init__.py @@ -60,7 +60,7 @@ class SingleNodeDockerCluster(Cluster): def __init__(self): self.minifi_version = os.environ['MINIFI_VERSION'] - self.nifi_version = '1.4.0-SNAPSHOT' + self.nifi_version = '1.5.0' self.minifi_root = '/opt/minifi/nifi-minifi-cpp-' + self.minifi_version self.nifi_root = '/opt/nifi/nifi-' + self.nifi_version self.network = None @@ -159,7 +159,7 @@ class SingleNodeDockerCluster(Cluster): RUN sed -i -e 's/^\(nifi.remote.input.socket.port\)=.*/\\1=5000/' {nifi_root}/conf/nifi.properties USER nifi """.format(name=name, - base_image='apachenifi:' + self.nifi_version, + base_image='apache/nifi:' + self.nifi_version, nifi_root=self.nifi_root)) test_flow_xml = nifi_flow_xml(flow, self.nifi_version)
