Nate Stephany
2020-03-12 632f530f1627b78391639d8ccfeb65b5ee4b64d8
Remove bucket from defaults and add tests (#1307)

* remove bucket from defaults

* add overwatch uri calls

* update output to individual json files

* remove token

* add token var to defaults
3 files modified
51 ■■■■ changed files
ansible/configs/ocp4-disconnected-osp-lab/default_vars.yml 5 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-disconnected-osp-lab/files/fio-test.sh.j2 6 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-disconnected-osp-lab/software.yml 40 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-disconnected-osp-lab/default_vars.yml
@@ -210,8 +210,9 @@
test_runs: 50
test_s3_id: FROM_SECRET
test_s3_key: FROM_SECRET
test_s3_bucket: gpte-ocp-perf-test
test_s3_region: us-east-2
test_s3_bucket: FROM_SECRET
test_s3_region: FROM_SECRET
test_overwatch: FROM_SECRET
# If you are deploying OpenShift, this should be set to the network that you
# want to use and will be used to create security groups.
ansible/configs/ocp4-disconnected-osp-lab/files/fio-test.sh.j2
@@ -7,7 +7,5 @@
mkdir /var/lib/etcd/fio
echo "running tests"
for i in {1..{{ test_runs }}};do echo "running test $i";fio --rw=write --ioengine=sync --fdatasync=1 --directory=/var/lib/etcd/fio --size=22m --bs=2300 --name=mytest --output-format=json+ | jq '.jobs[].sync.lat_ns.percentile."99.000000"' >> {{ guid }}-fio.out;done
echo "uploading to s3"
/host/home/core/upload-to-s3.sh '{{ test_s3_id }}' '{{ test_s3_key }}' {{ test_s3_bucket }}@{{ test_s3_region }} ./{{ guid }}-fio.out {{ guid }}-fio.out
#for i in {1..{{ test_runs }}};do echo "running test $i";fio --rw=write --ioengine=sync --fdatasync=1 --directory=/var/lib/etcd/fio --size=22m --bs=2300 --name=mytest --output-format=json+ | jq '.jobs[].sync.lat_ns.percentile."99.000000"' >> {{ guid }}-$i.json;/host/home/core/upload-to-s3.sh '{{ test_s3_id }}' '{{ test_s3_key }}' {{ test_s3_bucket }}@{{ test_s3_region }} ./{{ guid }}-$i.json {{ guid }}-$i.json;done
for i in {1..{{ test_runs }}};do echo "running test $i";fio --rw=write --ioengine=sync --fdatasync=1 --directory=/var/lib/etcd/fio --size=22m --bs=2300 --name=mytest --output-format=json+ > {{ guid }}-$i.json;/host/home/core/upload-to-s3.sh '{{ test_s3_id }}' '{{ test_s3_key }}' {{ test_s3_bucket }}@{{ test_s3_region }} ./{{ guid }}-$i.json {{ guid }}-$i.json;done
ansible/configs/ocp4-disconnected-osp-lab/software.yml
@@ -272,6 +272,15 @@
            dest: "/etc/openstack/clouds.yaml"
            mode: 0644
        - name: Send notice to overwatch for start
          uri:
            url: http://overwatch.osp.opentlc.com:3000/api/annotations
            method: POST
            body_format: json
            headers:
              Authorization: "Bearer {{ test_overwatch }}"
            body: {"text":"BEGIN ocp4 disconnected install","tags":["ocp4","perftest"]}
        - name: Run solver for lab 03
          shell: /usr/local/bin/solve_lab ocp4_advanced_deployment 03_1
          register: r_solve_lab_03
@@ -285,10 +294,15 @@
          vars:
            GUID: "{{ guid }}"
        - name: dump r_solve_lab_03
          debug:
            var: r_solve_lab_03
        - name: Send notice to overwatch for finish
          uri:
            url: http://overwatch.osp.opentlc.com:3000/api/annotations
            method: POST
            body_format: json
            headers:
              Authorization: "Bearer {{ test_overwatch }}"
            body: {"text":"END ocp4 disconnected install","tags":["ocp4","perftest"]}
    - when: 
        - test_enable
        - test_results
@@ -327,6 +341,15 @@
          vars:
            INFRA_ID: "{{ r_infra_id.stdout }}"
            
        - name: Send notice to overwatch for start
          uri:
            url: http://overwatch.osp.opentlc.com:3000/api/annotations
            method: POST
            body_format: json
            headers:
              Authorization: "Bearer {{ test_overwatch }}"
            body: {"text":"BEGIN fio test","tags":["ocp4","perftest"]}
        - name: Run test container on master-0
          shell: >
            ssh -i /home/{{ student_name }}/.ssh/{{ guid }}key.pem
@@ -337,6 +360,15 @@
          vars:
            INFRA_ID: "{{ r_infra_id.stdout }}"
        - name: Send notice to overwatch for finish
          uri:
            url: http://overwatch.osp.opentlc.com:3000/api/annotations
            method: POST
            body_format: json
            headers:
              Authorization: "Bearer {{ test_overwatch }}"
            body: {"text":"END fio test","tags":["ocp4","perftest"]}
        - name: Remove test scripts
          file:
            state: absent