diff options
Diffstat (limited to 'ci/daily.sh')
| -rwxr-xr-x | ci/daily.sh | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/ci/daily.sh b/ci/daily.sh index ada8cfd..1e99709 100755 --- a/ci/daily.sh +++ b/ci/daily.sh @@ -26,17 +26,13 @@ git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng "${WORKSPACE}/ci/job/ rm -rf "${WORKSPACE}/ci/job/joid" git clone --depth 1 https://gerrit.opnfv.org/gerrit/joid "${WORKSPACE}/ci/job/joid" -virtualenv "${WORKSPACE}/ci/job/storperf_daily_venv" +python3 -m venv "${WORKSPACE}/ci/job/storperf_daily_venv" # shellcheck source=/dev/null source "${WORKSPACE}/ci/job/storperf_daily_venv/bin/activate" -pip install --upgrade setuptools==33.1.1 -pip install cryptography==1.7.2 -pip install functools32==3.2.3.post2 -pip install pytz==2016.10 -pip install osc_lib==1.3.0 -pip install python-openstackclient==3.7.0 -pip install python-heatclient==1.16.0 +python3 -m pip install --upgrade setuptools==40.5.0 +python3 -m pip install python-openstackclient==3.16.1 +python3 -m pip install python-heatclient==1.16.1 "${WORKSPACE}/ci/generate-admin-rc.sh" @@ -93,14 +89,14 @@ JOB=$("${WORKSPACE}/ci/start_job.sh" \ curl -s -X GET "http://127.0.0.1:5000/api/v1.0/jobs?id=${JOB}&type=status" \ -o "${WORKSPACE}/ci/job/status.json" -JOB_STATUS=$(grep -A2 $JOB "${WORKSPACE}/ci/job/status.json" | awk '/Status/ {print $2}' | cut -d\" -f2) +JOB_STATUS=$(awk '/Status/ {print $2}' "${WORKSPACE}/ci/job/status.json" | cut -d\" -f2) while [ "${JOB_STATUS}" != "Completed" ] do sleep 600 mv "${WORKSPACE}/ci/job/status.json" "${WORKSPACE}/ci/job/old-status.json" curl -s -X GET "http://127.0.0.1:5000/api/v1.0/jobs?id=${JOB}&type=status" \ -o "${WORKSPACE}/ci/job/status.json" - JOB_STATUS=$(grep -A2 $JOB "${WORKSPACE}/ci/job/status.json" | awk '/Status/ {print $2}' | cut -d\" -f2) + JOB_STATUS=$(awk '/Status/ {print $2}' "${WORKSPACE}/ci/job/status.json" | cut -d\" -f2) if diff "${WORKSPACE}/ci/job/status.json" "${WORKSPACE}/ci/job/old-status.json" >/dev/null then cat "${WORKSPACE}/ci/job/status.json" |