Skip to content
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

Livelabs green button #64

Merged
merged 1 commit into from
Nov 27, 2023
+5 −3
Merged

Livelabs green button #64

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
7 changes: 4 additions & 3 deletions basis/bin/shared_bash_function.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,11 @@ get_user_details() {
fi

# Find TF_VAR_username based on TF_VAR_user_ocid or the opposite
if [ "$TF_VAR_username" != "" ]; then
export TF_VAR_user_ocid=`oci iam user list --name $TF_VAR_username | jq -r .data[0].id`
elif [ "$TF_VAR_user_ocid" != "" ]; then
# In this order, else this is not reentrant. "oci iam user list" require more privileges.
if [ "$TF_VAR_user_ocid" != "" ]; then
export TF_VAR_username=`oci iam user get --user-id $TF_VAR_user_ocid | jq -r '.data.name'`
elif [ "$TF_VAR_username" != "" ]; then
export TF_VAR_user_ocid=`oci iam user list --name $TF_VAR_username | jq -r .data[0].id`
fi
auto_echo TF_VAR_username=$TF_VAR_username
auto_echo TF_VAR_user_ocid=$TF_VAR_user_ocid
Expand Down
1 change: 1 addition & 0 deletions option/test_suite_shared.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ build_option() {
if [ "$OPTION_SHAPE" != "amd" ]; then
NAME=${NAME}-$OPTION_SHAPE
fi
NAME=${NAME/_/-}
start_test $NAME
cd $TEST_HOME/oci-starter
./oci_starter.sh \
Expand Down