diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-17 19:02:50 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-17 19:02:50 +0800 |
| commit | 9663493ba0d493ec62153e725b5d30340f2aa525 (patch) | |
| tree | b5f71e511683e0121a1bfb4e945b75e5445285a0 /tests/files/ansible | |
| parent | 22893b7ac925c49168c119f293ea8befc3aff5cc (diff) | |
| parent | dffaa678f966f87dcd011671a16b554b29a37549 (diff) | |
| download | dexon-9663493ba0d493ec62153e725b5d30340f2aa525.tar.gz dexon-9663493ba0d493ec62153e725b5d30340f2aa525.tar.zst dexon-9663493ba0d493ec62153e725b5d30340f2aa525.zip | |
Merge commit 'dffaa678f966f87dcd011671a16b554b29a37549' into develop
Diffstat (limited to 'tests/files/ansible')
| -rw-r--r-- | tests/files/ansible/ec2-setup.yml | 2 | ||||
| -rw-r--r-- | tests/files/ansible/roles/ec2/tasks/setup.yml | 11 | ||||
| -rw-r--r-- | tests/files/ansible/roles/ec2/vars/main.yml | 6 | ||||
| -rw-r--r-- | tests/files/ansible/test-files/docker-cppjit/Dockerfile | 2 | ||||
| -rwxr-xr-x | tests/files/ansible/test-files/testrunner.sh | 2 |
5 files changed, 9 insertions, 14 deletions
diff --git a/tests/files/ansible/ec2-setup.yml b/tests/files/ansible/ec2-setup.yml index 787d8670e..37396d523 100644 --- a/tests/files/ansible/ec2-setup.yml +++ b/tests/files/ansible/ec2-setup.yml @@ -1,6 +1,6 @@ --- - name: Provision EC2 instances - hosts: local + hosts: localhost gather_facts: false roles: - ec2 diff --git a/tests/files/ansible/roles/ec2/tasks/setup.yml b/tests/files/ansible/roles/ec2/tasks/setup.yml index 0876d8d2d..299b55c35 100644 --- a/tests/files/ansible/roles/ec2/tasks/setup.yml +++ b/tests/files/ansible/roles/ec2/tasks/setup.yml @@ -24,10 +24,9 @@ region: "{{ region }}" key_name: "{{ keypair }}" instance_tags: - Name: test_runner + Name: "{{ item }}" + Role: client-tests count_tag: - Name: test_runner - exact_count: "{{ total_no_instances }}" -# volumes: -# - device_name: /dev/xvda -# volume_size: "{{ volume_size_gb }}" + Name: "{{ item }}" + exact_count: 1 + with_sequence: start=0 end={{ total_no_instances - 1 }} format=testrunner-%1u diff --git a/tests/files/ansible/roles/ec2/vars/main.yml b/tests/files/ansible/roles/ec2/vars/main.yml index ea260c927..f5cf28596 100644 --- a/tests/files/ansible/roles/ec2/vars/main.yml +++ b/tests/files/ansible/roles/ec2/vars/main.yml @@ -4,13 +4,9 @@ instance_type: c4.xlarge security_group: client-tests -# image: ami-d6e7c084 image: ami-9eaa1cf6 -# region: ap-southeast-1 region: us-east-1 keypair: christoph -# keypair: client-tests -volume_size_gb: 50 # limit access to AWS to these clients in CDIR notation ip_access_range: 0.0.0.0/0 @@ -18,4 +14,4 @@ ip_access_range: 0.0.0.0/0 project_description: https://github.com/ethereum/tests -total_no_instances: 1 +total_no_instances: 3 diff --git a/tests/files/ansible/test-files/docker-cppjit/Dockerfile b/tests/files/ansible/test-files/docker-cppjit/Dockerfile index b9b9b68ba..2b10727f0 100644 --- a/tests/files/ansible/test-files/docker-cppjit/Dockerfile +++ b/tests/files/ansible/test-files/docker-cppjit/Dockerfile @@ -43,4 +43,4 @@ RUN mkdir -p cpp-ethereum/build RUN cd cpp-ethereum/build && cmake .. -DCMAKE_BUILD_TYPE=Debug -DVMTRACE=1 -DPARANOIA=1 -DEVMJIT=1 && make -j $(cat /proc/cpuinfo | grep processor | wc -l) && make install RUN ldconfig -ENTRYPOINT ["/cpp-ethereum/build/test/checkRandomTest"] +ENTRYPOINT ["/cpp-ethereum/build/test/checkRandomStateTest"] diff --git a/tests/files/ansible/test-files/testrunner.sh b/tests/files/ansible/test-files/testrunner.sh index 33ad25fad..c7763b1f1 100755 --- a/tests/files/ansible/test-files/testrunner.sh +++ b/tests/files/ansible/test-files/testrunner.sh @@ -7,7 +7,7 @@ cd ~/testout export EVMJIT="-cache=0" while [ 1 ] do - TEST="$(docker run --rm --entrypoint=\"/cpp-ethereum/build/test/createRandomTest\" ethereum/cppjit-testrunner)" + TEST="$(docker run --rm --entrypoint=\"/cpp-ethereum/build/test/createRandomStateTest\" ethereum/cppjit-testrunner)" # echo "$TEST" # test pyethereum |