Backport required changes from master to releases/2.8.0 #1318
Conversation
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| ${result} = Run Process git clone -b ${KUEUE_REPO_BRANCH} ${KUEUE_REPO_URL} ${KUEUE_DIR} | ||
| ... shell=true stderr=STDOUT | ||
| Log To Console "Downloading compiled test binary e2e-singlecluster" | ||
| ${result} = Run Process curl --location --silent --output e2e-singlecluster ${KUEUE_RELEASE_ASSETS}/e2e-singlecluster && chmod +x e2e-singlecluster |
Check warning
Code scanning / Robocop
Line is too long ({{ line_length }}/{{ allowed_length }}) Warning test
| @@ -145,6 +146,7 @@ | |||
|
|
|||
| Wait For Cluster To Be Ready | |||
| ${pool_namespace} = Get Cluster Pool Namespace ${pool_name} | |||
| Set Task Variable ${pool_namespace} | |||
Check notice
Code scanning / Robocop
{{ set_variable_keyword }} can be replaced with VAR Note
| @@ -145,6 +146,7 @@ | |||
|
|
|||
| Wait For Cluster To Be Ready | |||
| ${pool_namespace} = Get Cluster Pool Namespace ${pool_name} | |||
| Set Task Variable ${pool_namespace} | |||
Check warning
Code scanning / Robocop
Test, suite and global variables should be uppercase Warning
| ${result} = Run Process | ||
| ... oc -n ${pool_namespace} get cd ${pool_namespace} -o json | jq -r '.status.webConsoleURL' --exit-status | ||
| ... shell=yes | ||
| Should Be True ${result.rc} == 0 |
Check notice
Code scanning / Robocop
'{{ block_name }}' condition can be simplified Note
| @@ -62,7 +62,7 @@ | |||
| [Teardown] Disable Component kueue | |||
| Wait Component Ready kueue | |||
| Log To Console Waiting for kueue-controller-manager to be available | |||
| ${result} = Run Process oc wait --for\=condition\=Available --timeout\=60s -n ${ODH_NAMESPACE} deployment/kueue-controller-manager | |||
| ${result} = Run Process oc wait --for\=condition\=Available --timeout\=300s -n ${ODH_NAMESPACE} deployment/kueue-controller-manager | |||
Check warning
Code scanning / Robocop
Line is too long ({{ line_length }}/{{ allowed_length }}) Warning test
| ${test_crs}= Create List ${CR_1} ${CR_2} | ||
| FOR ${nb_cr} IN @{test_crs} | ||
| ${present}= Run Keyword And Return Status OpenshiftLibrary.Oc Get kind=Notebook namespace=${NOTEBOOK_NS} name=${nb_cr} | ||
| ${test_usernames}= Create List ${TEST_USER.USERNAME} ${TEST_USER_3.USERNAME} ${TEST_USER_4.USERNAME} |
Check notice
Code scanning / Robocop
{{ create_keyword }} can be replaced with VAR Note test
| ${PVC_BASIC_USER}= Get User Notebook PVC Name ${TEST_USER_3.USERNAME} | ||
| ${PVC_BASIC_USER_2}= Get User Notebook PVC Name ${TEST_USER_4.USERNAME} | ||
| ${test_pvcs}= Create List ${PVC_BASIC_USER} ${PVC_BASIC_USER_2} | ||
| ${test_pvcs}= Create List ${PVC_ADMIN_USER} ${PVC_BASIC_USER} ${PVC_BASIC_USER_2} |
Check notice
Code scanning / Robocop
{{ create_keyword }} can be replaced with VAR Note test
Robot Results
|
|
Would it make sense to create this PR through Or do a merge with merge commit which (maybe) also preserves commit hashes? There is this "Daggy Fixes and Cherry-picking" from https://queue.acm.org/detail.cfm?id=1595636 which I found from https://stackoverflow.com/questions/2922652/git-is-there-a-way-to-figure-out-where-a-commit-was-cherry-picked-from sounds interesting, btw. But it's too late to use it for the commits above, and I don't exactly understand how this is supposed to work in Git. |
I don't know how to do these things in UI so yeah - I used
I was also thinking about this, to keep the merge commit there, yes. |
* adding link to prod bugs * add ref to bugs * add flaky test tags (cherry picked from commit edafbcc)
(cherry picked from commit 5e7f4b1)
related to jira ticket: RHOAIENG-3338 Signed-off-by: Kobi Hakimi <[email protected]> (cherry picked from commit b6fb7f7)
(cherry picked from commit 9485246)
There were two headers section logged instead of one request body section logged in the report. (cherry picked from commit abfb8a5)
The cleanup only checked for resources of two users but in the tests there are used three different users, so let's clean after all three. (cherry picked from commit fc76761)
This test was probably failing since the addition of the accelerator profiles. Since I have no idea where is some documentation to the dashboard API which we use here, I grepped my local disk for some keywords and was able to find this file [1] from which I was able to understand what is wrong with this test. As such, please review thoroughly since I could miss something. [1] https://github.com/opendatahub-io/odh-dashboard/blob/main/frontend/src/types.ts#L670> (cherry picked from commit 439e2b3)
(cherry picked from commit 5db9e26)
|
|
@jiridanek I have updated this PR so that all commits now have the info they are being cherry-picked from somewhere. |
jiridanek
added
enhancements
jstourac
merged commit 4088985
into
red-hat-data-services:releases/2.8.0
This PR contains following fixes from the
masterbranch:I kept the order in which these commits were merged in the
masterbranch and provided both link to the particular commit and also link to the particular PR so it's clearer to understand later on.