Skip to content

OCPBUGS-92035: Allow to customize internal hardcoded timeouts #81028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pawanpinjarkar wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OCPBUGS-92035: Allow to customize internal hardcoded timeouts #81028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...c/conformance/iso-no-registry/agent-e2e-generic-conformance-iso-no-registry-workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ workflow:
allow_skip_on_success: true
env:
DEVSCRIPTS_TARGET: agent
DEVSCRIPTS_TARGET_TIMEOUT: 180m
pre:
- chain: agent-pre
test:
Expand Down
4 changes: 2 additions & 2 deletions ...rator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ EOF
scp "${SSHOPTS[@]}" "${SHARED_DIR}/dev-scripts-additional-config" "root@${IP}:dev-scripts-additional-config"

# Use '/auths/ s/.*/' instead of 's/.*auths.*/' to avoid regex backtracking on long log lines
timeout -s 9 175m ssh "${SSHOPTS[@]}" "root@${IP}" bash - << EOF |& sed -e '/auths/ s/.*/*** PULL_SECRET ***/'
timeout -s 9 ${DEVSCRIPTS_TIMEOUT:-175m} ssh "${SSHOPTS[@]}" "root@${IP}" bash - << EOF |& sed -e '/auths/ s/.*/*** PULL_SECRET ***/'

set -xeuo pipefail

Expand Down Expand Up @@ -437,7 +437,7 @@ fi
echo 'export KUBECONFIG=\$(ls /root/dev-scripts/ocp/*/auth/kubeconfig)' >> /root/.bashrc

set +e
timeout -s 9 130m make ${DEVSCRIPTS_TARGET}
timeout -s 9 ${DEVSCRIPTS_TARGET_TIMEOUT:-130m} make ${DEVSCRIPTS_TARGET}
rv=\$?

# squid needs to be restarted after network changes
Expand Down
6 changes: 6 additions & 0 deletions ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ ref:
- name: DEVSCRIPTS_TARGET
default: ""
documentation: Defines the makefile target to be executed. See https://github.com/openshift-metal3/dev-scripts/blob/master/Makefile for a list of available targets.
- name: DEVSCRIPTS_TARGET_TIMEOUT
default: ""
documentation: Defines the timeout for the dev-scripts target to be executed.
- name: DEVSCRIPTS_TIMEOUT
default: ""
documentation: Defines the timeout for the dev-scripts setup command.
- name: AGENT_E2E_TEST_BOOT_MODE
default: ""
documentation: Set the boot mode to DISKIMAGE for using the APPLIANCE_IMAGE
Expand Down