From 771d70b6ababe8f22740a1755fdd06f93706fa5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elek=20M=C3=A1rton?= Date: Wed, 19 May 2021 10:56:33 +0200 Subject: [PATCH 1/3] use generated branch names --- hadoop-ozone/dist/src/main/smoketest/ozonefs/setup.robot | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hadoop-ozone/dist/src/main/smoketest/ozonefs/setup.robot b/hadoop-ozone/dist/src/main/smoketest/ozonefs/setup.robot index be50d309b208..9fd4d2bfc050 100644 --- a/hadoop-ozone/dist/src/main/smoketest/ozonefs/setup.robot +++ b/hadoop-ozone/dist/src/main/smoketest/ozonefs/setup.robot @@ -30,6 +30,10 @@ ${DEEP_DIR} test/${SCHEME}/dir *** Keywords *** Setup for FS test + ${random} = Generate Random String 5 [NUMBERS] + Set Suite Variable ${BUCKET} ${random}-${BUCKET_TYPE}1-${SCHEME} + Set Suite Variable ${BUCKET2} ${random}-${BUCKET_TYPE}2-${SCHEME} + Set Suite Variable ${BUCKET_IN_VOL2} ${random}-${BUCKET_TYPE}3-${SCHEME} Create volumes for FS test Run Keyword Create ${BUCKET_TYPE}s for FS test Sanity check for FS test From d8f5a3fd8bc96bc9c618b2ff3af16141e6c6e6b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elek=20M=C3=A1rton?= Date: Mon, 31 May 2021 10:25:48 +0200 Subject: [PATCH 2/3] move random bucket generation to 'Assign suite vars for FS test' --- .../dist/src/main/smoketest/ozonefs/setup.robot | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/hadoop-ozone/dist/src/main/smoketest/ozonefs/setup.robot b/hadoop-ozone/dist/src/main/smoketest/ozonefs/setup.robot index be50d309b208..cb25ed9f31d5 100644 --- a/hadoop-ozone/dist/src/main/smoketest/ozonefs/setup.robot +++ b/hadoop-ozone/dist/src/main/smoketest/ozonefs/setup.robot @@ -30,10 +30,10 @@ ${DEEP_DIR} test/${SCHEME}/dir *** Keywords *** Setup for FS test + Assign suite vars for FS test Create volumes for FS test Run Keyword Create ${BUCKET_TYPE}s for FS test Sanity check for FS test - Assign suite vars for FS test Log Completed setup for ${SCHEME} tests with ${BUCKET_TYPE}s in ${VOLUME}/${BUCKET} using FS base URL: ${BASE_URL} Create volumes for FS test @@ -65,6 +65,10 @@ Sanity check for FS test Should contain ${result} ${BUCKET2} Assign suite vars for FS test - ${BASE_URL} = Format FS URL ${SCHEME} ${VOLUME} ${BUCKET} / + ${random} = Generate Random String 5 [NUMBERS] + Set Suite Variable ${BUCKET} ${random}-${BUCKET_TYPE}1-${SCHEME} + Set Suite Variable ${BUCKET2} ${random}-${BUCKET_TYPE}2-${SCHEME} + Set Suite Variable ${BUCKET_IN_VOL2} ${random}-${BUCKET_TYPE}3-${SCHEME} + ${BASE_URL} = Format FS URL ${SCHEME} ${VOLUME} ${BUCKET} / Set Suite Variable ${BASE_URL} - Set Suite Variable ${DEEP_URL} ${BASE_URL}${DEEP_DIR} + Set Suite Variable ${DEEP_URL} ${BASE_URL}${DEEP_DIR} \ No newline at end of file From 139b1c63e2c6b88d640af1f99279037f329018bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elek=20M=C3=A1rton?= Date: Mon, 31 May 2021 10:26:53 +0200 Subject: [PATCH 3/3] move random bucket generation to 'Assign suite vars for FS test' --- .../dist/src/main/smoketest/ozonefs/setup.robot | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hadoop-ozone/dist/src/main/smoketest/ozonefs/setup.robot b/hadoop-ozone/dist/src/main/smoketest/ozonefs/setup.robot index 9fd4d2bfc050..cb25ed9f31d5 100644 --- a/hadoop-ozone/dist/src/main/smoketest/ozonefs/setup.robot +++ b/hadoop-ozone/dist/src/main/smoketest/ozonefs/setup.robot @@ -30,14 +30,10 @@ ${DEEP_DIR} test/${SCHEME}/dir *** Keywords *** Setup for FS test - ${random} = Generate Random String 5 [NUMBERS] - Set Suite Variable ${BUCKET} ${random}-${BUCKET_TYPE}1-${SCHEME} - Set Suite Variable ${BUCKET2} ${random}-${BUCKET_TYPE}2-${SCHEME} - Set Suite Variable ${BUCKET_IN_VOL2} ${random}-${BUCKET_TYPE}3-${SCHEME} + Assign suite vars for FS test Create volumes for FS test Run Keyword Create ${BUCKET_TYPE}s for FS test Sanity check for FS test - Assign suite vars for FS test Log Completed setup for ${SCHEME} tests with ${BUCKET_TYPE}s in ${VOLUME}/${BUCKET} using FS base URL: ${BASE_URL} Create volumes for FS test @@ -69,6 +65,10 @@ Sanity check for FS test Should contain ${result} ${BUCKET2} Assign suite vars for FS test - ${BASE_URL} = Format FS URL ${SCHEME} ${VOLUME} ${BUCKET} / + ${random} = Generate Random String 5 [NUMBERS] + Set Suite Variable ${BUCKET} ${random}-${BUCKET_TYPE}1-${SCHEME} + Set Suite Variable ${BUCKET2} ${random}-${BUCKET_TYPE}2-${SCHEME} + Set Suite Variable ${BUCKET_IN_VOL2} ${random}-${BUCKET_TYPE}3-${SCHEME} + ${BASE_URL} = Format FS URL ${SCHEME} ${VOLUME} ${BUCKET} / Set Suite Variable ${BASE_URL} - Set Suite Variable ${DEEP_URL} ${BASE_URL}${DEEP_DIR} + Set Suite Variable ${DEEP_URL} ${BASE_URL}${DEEP_DIR} \ No newline at end of file