openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Remove "-oooq" from toci script name 

The symlink that resolved this is no longer in the repo. We only
have a single toci runner script now.

Related-Bug: #1778974
Change-Id: I2fc830c9452766719ec482f2b4ee1a97e7123b29
This commit is contained in:
trown 2018-06-27 15:09:32 -04:00 committed by wes hayutin
parent c00e652b36
commit 12da08b98c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
roles/create-reproducer-script/templates/README-reproducer-quickstart.html.j2
View File

@ -15,9 +15,9 @@ issue.</p>
<h2>What is the reproducer-quickstart.sh script?</h2>
<p>A <b>reproducer-quickstart.sh</b> script is generated at the top-level log directory
for jobs that run TripleO-Quickstart and toci_gate_test-oooq.sh. Running the script
for jobs that run TripleO-Quickstart and toci_gate_test.sh. Running the script
from a host machine will set up a stack to the point where the user can ssh to the
undercloud, source a variable file, and run <b>toci_gate_test-oooq.sh</b>. As such,
undercloud, source a variable file, and run <b>toci_gate_test.sh</b>. As such,
reproducing the complete jobs result requires some manual interaction.</p>
<p>The <b>reproducer-quickstart.sh</b> script is generated to be specific to that
@ -40,12 +40,12 @@ and resources to reproduce the job before you begin.</p>
modify the script to run on another host cloud are included in a section below.</p>
<p>When the script completes, you will see a list of instructions printed out on how
to run <b>toci_gate_test-oooq.sh</b> from the undercloud:</p>
to run <b>toci_gate_test.sh</b> from the undercloud:</p>
<ul>
<li><code>ssh to the undercloud: $ ssh zuul@$ansible_host</code></li>
<li><code>Source the environment settings file: $ source /home/zuul/env_vars_to_src.sh</code></li>
<li><code>Run the toci gate script: $ /opt/stack/tripleo-ci/toci_gate_test-oooq.sh</code></li>
<li><code>Run the toci gate script: $ /opt/stack/tripleo-ci/toci_gate_test.sh</code></li>
</ul>
<h2>Input argument options in the reproducer-quickstart.sh script</h2>

6
roles/create-reproducer-script/templates/reproducer-quickstart.sh.j2
View File

@ -326,19 +326,19 @@ fi
scp ${SSH_OPTS} "$WORKSPACE/{{ env_vars_to_source_file }}" zuul@$ansible_host:/home/zuul/
if [[ "$AUTORUN" == "1" ]]; then
ssh ${SSH_OPTS} zuul@$ansible_host -tt \
"screen -LS ci -h 25000 -dm bash -c 'set -m; source ~/{{ env_vars_to_source_file }}; ANSIBLE_FORCE_COLOR=true /opt/stack/tripleo-ci/toci_gate_test-oooq.sh 2>&1 | tee ~/console.log; exec bash' && screen -RD"
"screen -LS ci -h 25000 -dm bash -c 'set -m; source ~/{{ env_vars_to_source_file }}; ANSIBLE_FORCE_COLOR=true /opt/stack/tripleo-ci/toci_gate_test.sh 2>&1 | tee ~/console.log; exec bash' && screen -RD"
else
# Remove -x so that the instructions don't print twice
set +x
# Instruct the user to execute toci_gate_test-oooq.sh on the undercloud
# Instruct the user to execute toci_gate_test.sh on the undercloud
echo "
# Now complete the test excution on the undercloud:
# ssh to the undercloud:
ssh ${SSH_OPTS} zuul@$ansible_host
# Source the environment settings file and run the toci gate script
source /home/zuul/env_vars_to_src.sh
/opt/stack/tripleo-ci/toci_gate_test-oooq.sh 2>&1 | tee console.log
/opt/stack/tripleo-ci/toci_gate_test.sh 2>&1 | tee console.log
# To avoid timeouts, you can start a screen session before executing the commands:
screen -S ci