Skip to content

[BM/CPT] Fix censor #68938

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
wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −6
Open

[BM/CPT] Fix censor #68938

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
2 changes: 1 addition & 1 deletion ...try/openshift-qe/installer/bm/day2/sriov/openshift-qe-installer-bm-day2-sriov-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -o pipefail
set -x
cat /etc/os-release

SRIOV_NUM_VFS=$(cat ${CLUSTER_PROFILE_DIR}/sriov_num_vfs)
SRIOV_NUM_VFS=$(cat ${CLUSTER_PROFILE_DIR}/config | jq ".sriov_num_vfs")
SRIOV_PF_NAME=$(cat ${CLUSTER_PROFILE_DIR}/sriov_pf_name)

oc config view
Expand Down
4 changes: 2 additions & 2 deletions ...ep-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ LAB_CLOUD=$(cat ${CLUSTER_PROFILE_DIR}/lab_cloud || cat ${SHARED_DIR}/lab_cloud)
export LAB_CLOUD
LAB_INTERFACE=$(cat ${CLUSTER_PROFILE_DIR}/lab_interface)
if [[ "$NUM_WORKER_NODES" == "" ]]; then
NUM_WORKER_NODES=$(cat ${CLUSTER_PROFILE_DIR}/num_worker_nodes)
NUM_WORKER_NODES=$(cat ${CLUSTER_PROFILE_DIR}/config | jq ".num_worker_nodes")
export NUM_WORKER_NODES
fi
QUADS_INSTANCE=$(cat ${CLUSTER_PROFILE_DIR}/quads_instance_${LAB})
Expand Down Expand Up @@ -59,7 +59,7 @@ if [[ $PUBLIC_VLAN == "false" ]]; then
fi

if [[ ! -z "$NUM_HYBRID_WORKER_NODES" ]]; then
HV_NIC_INTERFACE=$(cat "${CLUSTER_PROFILE_DIR}/hypervisor_nic_interface")
HV_NIC_INTERFACE=$(cat "${CLUSTER_PROFILE_DIR}/config" | jq ".hypervisor_nic_interface")
export HV_NIC_INTERFACE

cat <<EOF >>/tmp/all.yml
Expand Down
2 changes: 1 addition & 1 deletion ...-registry/openshift-qe/installer/bm/prereqs/openshift-qe-installer-bm-prereqs-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export LAB
LAB_CLOUD=$(cat ${CLUSTER_PROFILE_DIR}/lab_cloud || cat ${SHARED_DIR}/lab_cloud)
export LAB_CLOUD
if [[ "$NUM_WORKER_NODES" == "" ]]; then
NUM_WORKER_NODES=$(cat ${CLUSTER_PROFILE_DIR}/num_worker_nodes)
NUM_WORKER_NODES=$(cat ${CLUSTER_PROFILE_DIR}/config | jq ".num_worker_nodes")
export NUM_WORKER_NODES
fi
QUADS_INSTANCE=$(cat ${CLUSTER_PROFILE_DIR}/quads_instance_${LAB})
Expand Down
2 changes: 1 addition & 1 deletion ...istry/openshift-qe/rhoso/browbeat-install/openshift-qe-rhoso-browbeat-install-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SSH_ARGS="-i ${CLUSTER_PROFILE_DIR}/jh_priv_ssh_key -oStrictHostKeyChecking=no -
jumphost=$(cat ${CLUSTER_PROFILE_DIR}/address)
bastion=$(cat ${CLUSTER_PROFILE_DIR}/bastion)
es_host=$(cat ${CLUSTER_PROFILE_DIR}/elastic_host)
es_port=$(cat ${CLUSTER_PROFILE_DIR}/elastic_port)
es_port=$(cat ${CLUSTER_PROFILE_DIR}/config | jq ".elastic_port")
build_id="${BUILD_ID:-unknown}"

cat > /tmp/browbeat_install_script.sh <<EOF
Expand Down
2 changes: 1 addition & 1 deletion .../rhoso/installer/pre-provisioned/openshift-qe-rhoso-installer-pre-provisioned-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ bastion=$(cat ${CLUSTER_PROFILE_DIR}/bastion)

lab=$(cat ${CLUSTER_PROFILE_DIR}/lab)
lab_cloud=$(cat ${CLUSTER_PROFILE_DIR}/lab_cloud)
compute_count=$(cat ${CLUSTER_PROFILE_DIR}/compute_count)
compute_count=$(cat ${CLUSTER_PROFILE_DIR}/config | jq ".compute_count")
ctlplane_start_ip=$(cat ${CLUSTER_PROFILE_DIR}/ctlplane_start_ip)
kubeconfig=$(cat ${CLUSTER_PROFILE_DIR}/kubeconfig)
username=$(cat ${CLUSTER_PROFILE_DIR}/username)
Expand Down