Skip to content

Commit af9b03e

Browse files
arpsharmarpsharm
committed
Remove stale benchmark_operator_id and benchmark_wrapper_id from update_ci_status
1 parent 98c98b7 commit af9b03e

File tree

3 files changed

+15
-45
lines changed

3 files changed

+15
-45
lines changed

‎.github/workflows/Nightly_Perf_Env_CI.yml‎

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -301,37 +301,20 @@ jobs:
301301
RUN_TYPE: 'perf_ci'
302302
run: |
303303
# get repository last id
304-
declare -a repositories=('redhat-performance/benchmark-runner' 'cloud-bulldozer/benchmark-operator' 'cloud-bulldozer/benchmark-wrapper')
305-
for repository in "${repositories[@]}"
306-
do
307-
git clone "https://github.com/$repository" "$RUNNER_PATH/$repository"
308-
pushd "$RUNNER_PATH/$repository"
309-
case $repository in
310-
'redhat-performance/benchmark-runner')
311-
echo "BENCHMARK_RUNNER_ID=$(git rev-parse @)" >> "$GITHUB_ENV"
312-
BENCHMARK_RUNNER_ID=$(git rev-parse @)
313-
echo $BENCHMARK_RUNNER_ID
314-
;;
315-
'cloud-bulldozer/benchmark-operator')
316-
echo "BENCHMARK_OPERATOR_ID=$(git rev-parse @)" >> "$GITHUB_ENV"
317-
BENCHMARK_OPERATOR_ID=$(git rev-parse @)
318-
echo $BENCHMARK_OPERATOR_ID
319-
;;
320-
'cloud-bulldozer/benchmark-wrapper')
321-
echo "BENCHMARK_WRAPPER_ID=$(git rev-parse @)" >> "$GITHUB_ENV"
322-
BENCHMARK_WRAPPER_ID=$(git rev-parse @)
323-
echo $BENCHMARK_WRAPPER_ID
324-
;;
325-
esac
326-
done
304+
git clone "https://github.com/redhat-performance/benchmark-runner" "$RUNNER_PATH/redhat-performance/benchmark-runner"
305+
pushd "$RUNNER_PATH/redhat-performance/benchmark-runner"
306+
echo "BENCHMARK_RUNNER_ID=$(git rev-parse @)" >> "$GITHUB_ENV"
307+
BENCHMARK_RUNNER_ID=$(git rev-parse @)
308+
echo $BENCHMARK_RUNNER_ID
309+
popd
327310
build=$(pip freeze | grep benchmark-runner | sed 's/==/=/g')
328311
build_version="$(cut -d'=' -f2 <<<"$build")"
329312
end=$(printf '%(%s)T' -1)
330313
ci_minutes_time=$(( (end - START_CI) / 60))
331314
# Check for workload failure or success => return pass/failed
332315
if [[ "${{needs.workload.outputs.job_status}}" == "failure" || "${{needs.workload.outputs.job_status}}" == "cancelled" ]]; then status="failed"; else status="pass"; fi
333316
echo '>>>>>>>>>>>>>>>>>>>>>>>>>> Update CI status $status >>>>>>>>>>>>>>>>>>>>>>>>>>'
334-
ssh -t provision "podman run --rm -e KUBEADMIN_PASSWORD='$KUBEADMIN_PASSWORD' -e PIN_NODE_BENCHMARK_OPERATOR='$PIN_NODE_BENCHMARK_OPERATOR' -e PIN_NODE1='$PIN_NODE1' -e PIN_NODE2='$PIN_NODE2' -e ELASTICSEARCH='$ELASTICSEARCH' -e ELASTICSEARCH_PORT='$ELASTICSEARCH_PORT' -e ELASTICSEARCH_USER='$ELASTICSEARCH_USER' -e ELASTICSEARCH_PASSWORD='$ELASTICSEARCH_PASSWORD' -e BUILD_VERSION='$build_version' -e CI_STATUS='$status' -e CI_MINUTES_TIME='$ci_minutes_time' -e BENCHMARK_RUNNER_ID='$BENCHMARK_RUNNER_ID' -e BENCHMARK_OPERATOR_ID='$BENCHMARK_OPERATOR_ID' -e BENCHMARK_WRAPPER_ID='$BENCHMARK_WRAPPER_ID' -e RUN_TYPE='$RUN_TYPE' -e TIMEOUT='3600' -e log_level='INFO' -v '$CONTAINER_KUBECONFIG_PATH':'$CONTAINER_KUBECONFIG_PATH' --privileged '${{ secrets.QUAY_BENCHMARK_RUNNER_REPOSITORY }}'"
317+
ssh -t provision "podman run --rm -e KUBEADMIN_PASSWORD='$KUBEADMIN_PASSWORD' -e PIN_NODE_BENCHMARK_OPERATOR='$PIN_NODE_BENCHMARK_OPERATOR' -e PIN_NODE1='$PIN_NODE1' -e PIN_NODE2='$PIN_NODE2' -e ELASTICSEARCH='$ELASTICSEARCH' -e ELASTICSEARCH_PORT='$ELASTICSEARCH_PORT' -e ELASTICSEARCH_USER='$ELASTICSEARCH_USER' -e ELASTICSEARCH_PASSWORD='$ELASTICSEARCH_PASSWORD' -e BUILD_VERSION='$build_version' -e CI_STATUS='$status' -e CI_MINUTES_TIME='$ci_minutes_time' -e BENCHMARK_RUNNER_ID='$BENCHMARK_RUNNER_ID' -e RUN_TYPE='$RUN_TYPE' -e TIMEOUT='3600' -e log_level='INFO' -v '$CONTAINER_KUBECONFIG_PATH':'$CONTAINER_KUBECONFIG_PATH' --privileged '${{ secrets.QUAY_BENCHMARK_RUNNER_REPOSITORY }}'"
335318
echo '>>>>>>>>>>>>>>>>>>>>>>>>>> Remove image on provision >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>'
336319
echo "if [[ \"\$(sudo podman images -q ${{ secrets.QUAY_BENCHMARK_RUNNER_REPOSITORY }} 2> /dev/null)\" != \"\" ]]; then sudo podman rmi -f \$(sudo podman images -q ${{ secrets.QUAY_BENCHMARK_RUNNER_REPOSITORY }} 2> /dev/null); fi" > "$RUNNER_PATH/remove_image.sh"
337320
scp -r "$RUNNER_PATH/remove_image.sh" provision:"/tmp/remove_image.sh"

‎.github/workflows/Release_ClusterBuster_Perf_Env_CI.yml‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -215,29 +215,20 @@ jobs:
215215
CONTAINER_KUBECONFIG_PATH: ${{ secrets.CONTAINER_KUBECONFIG_PATH }}
216216
run: |
217217
# get repository last id
218-
declare -a repositories=('benchmark-operator' 'benchmark-wrapper')
219-
for repository in "${repositories[@]}"
220-
do
221-
git clone "https://github.com/cloud-bulldozer/$repository" "$RUNNER_PATH/$repository"
222-
pushd "$RUNNER_PATH/$repository"
223-
if [[ $repository == 'benchmark-operator' ]]
224-
then
225-
echo "BENCHMARK_OPERATOR_ID=$(git rev-parse @)" >> "$GITHUB_ENV"
226-
BENCHMARK_OPERATOR_ID=$(git rev-parse @)
227-
else
228-
echo "BENCHMARK_WRAPPER_ID=$(git rev-parse @)" >> "$GITHUB_ENV"
229-
BENCHMARK_WRAPPER_ID=$(git rev-parse @)
230-
fi
231-
popd
232-
done
218+
# get benchmark-runner last id
219+
git clone "https://github.com/redhat-performance/benchmark-runner" "$RUNNER_PATH/benchmark-runner"
220+
pushd "$RUNNER_PATH/benchmark-runner"
221+
echo "BENCHMARK_RUNNER_ID=$(git rev-parse @)" >> "$GITHUB_ENV"
222+
BENCHMARK_RUNNER_ID=$(git rev-parse @)
223+
popd
233224
build=$(pip freeze | grep benchmark-runner | sed 's/==/=/g')
234225
build_version="$(cut -d'=' -f2 <<<"$build")"
235226
end=$(printf '%(%s)T' -1)
236227
ci_minutes_time=$(( (end - START_CI) / 60))
237228
# Check for workload failure or success => return pass/failed
238229
if [[ "${{needs.workload.outputs.job_status}}" == "failure" || "${{needs.workload.outputs.job_status}}" == "cancelled" ]]; then status="failed"; else status="pass"; fi
239230
echo '>>>>>>>>>>>>>>>>>>>>>>>>>> Update CI status $status >>>>>>>>>>>>>>>>>>>>>>>>>>'
240-
podman run --rm -e KUBEADMIN_PASSWORD="$KUBEADMIN_PASSWORD" -e PIN_NODE_BENCHMARK_OPERATOR="$PIN_NODE_BENCHMARK_OPERATOR" -e PIN_NODE1="$PIN_NODE1" -e PIN_NODE2="$PIN_NODE2" -e ELASTICSEARCH="$ELASTICSEARCH" -e ELASTICSEARCH_PORT="$ELASTICSEARCH_PORT" -e ELASTICSEARCH_USER="$ELASTICSEARCH_USER" -e ELASTICSEARCH_PASSWORD="$ELASTICSEARCH_PASSWORD" -e BUILD_VERSION="$build_version" -e CI_STATUS="$status" -e CI_MINUTES_TIME="$ci_minutes_time" -e BENCHMARK_OPERATOR_ID="$BENCHMARK_OPERATOR_ID" -e BENCHMARK_WRAPPER_ID="$BENCHMARK_WRAPPER_ID" -e RUN_TYPE="perf_ci" -e TIMEOUT="3600" -e log_level="INFO" -v "$KUBECONFIG_PATH":"$CONTAINER_KUBECONFIG_PATH" --privileged "${{ secrets.QUAY_BENCHMARK_RUNNER_REPOSITORY }}"
231+
podman run --rm -e KUBEADMIN_PASSWORD="$KUBEADMIN_PASSWORD" -e PIN_NODE_BENCHMARK_OPERATOR="$PIN_NODE_BENCHMARK_OPERATOR" -e PIN_NODE1="$PIN_NODE1" -e PIN_NODE2="$PIN_NODE2" -e ELASTICSEARCH="$ELASTICSEARCH" -e ELASTICSEARCH_PORT="$ELASTICSEARCH_PORT" -e ELASTICSEARCH_USER="$ELASTICSEARCH_USER" -e ELASTICSEARCH_PASSWORD="$ELASTICSEARCH_PASSWORD" -e BUILD_VERSION="$build_version" -e CI_STATUS="$status" -e CI_MINUTES_TIME="$ci_minutes_time" -e BENCHMARK_RUNNER_ID="$BENCHMARK_RUNNER_ID" -e RUN_TYPE="perf_ci" -e TIMEOUT="3600" -e log_level="INFO" -v "$KUBECONFIG_PATH":"$CONTAINER_KUBECONFIG_PATH" --privileged "${{ secrets.QUAY_BENCHMARK_RUNNER_REPOSITORY }}"
241232
echo '>>>>>>>>>>>>>>>>>>>>>>>>>> Remove image on provision >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>'
242233
echo "if [[ \"\$(sudo podman images -q ${{ secrets.QUAY_BENCHMARK_RUNNER_REPOSITORY }} 2> /dev/null)\" != \"\" ]]; then sudo podman rmi -f \$(sudo podman images -q ${{ secrets.QUAY_BENCHMARK_RUNNER_REPOSITORY }} 2> /dev/null); fi" > "$RUNNER_PATH/remove_image.sh"
243234
scp -r "$RUNNER_PATH/remove_image.sh" provision:"/tmp/remove_image.sh"

‎benchmark_runner/main/main.py‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -213,13 +213,9 @@ def update_ci_status():
213213
"""
214214
ci_minutes_time = environment_variables_dict.get('ci_minutes_time', '')
215215
benchmark_runner_id = environment_variables_dict.get('benchmark_runner_id', '')
216-
benchmark_operator_id = environment_variables_dict.get('benchmark_operator_id', '')
217-
benchmark_wrapper_id = environment_variables_dict.get('benchmark_wrapper_id', '')
218216
benchmark_runner = Workloads()
219217
benchmark_runner.update_ci_status(status=ci_status, ci_minutes_time=int(ci_minutes_time),
220-
benchmark_runner_id=benchmark_runner_id,
221-
benchmark_operator_id=benchmark_operator_id,
222-
benchmark_wrapper_id=benchmark_wrapper_id)
218+
benchmark_runner_id=benchmark_runner_id)
223219

224220

225221
@logger_time_stamp

0 commit comments

Comments
 (0)