Export S3 url directly from generate-properties-master.sh

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>

diff --git a/scripts/system-tests/generate-properties-master.sh b/scripts/system-tests/generate-properties-master.sh
index ffaec297b59aa20bc7007246eb8368d6f5ff1bc7..5e7c4b01371dd1068a52e61d4802f4bf03b7ca41 100644 (file)
--- a/scripts/system-tests/generate-properties-master.sh
+++ b/scripts/system-tests/generate-properties-master.sh
@@ -52,9 +52,19 @@ echo "STORAGE_LINUX_MODULES=$BASE_STORAGE_FOLDER/modules/linux/$KERNEL_COMMIT_ID
 echo "STORAGE_LTTNG_MODULES=$BASE_STORAGE_FOLDER/modules/lttng/$KERNEL_COMMIT_ID-$LTTNG_MODULES_COMMIT_ID.$BUILD_DEVICE.lttng.modules.tar.gz" >> properties.txt
 
 BASE_S3_STORAGE="lava"
+BASE_S3_URL="https://obj.internal.efficios.com"
+
+S3_STORAGE_KERNEL_IMAGE=$BASE_S3_STORAGE/kernel/$KERNEL_COMMIT_ID.$BUILD_DEVICE.bzImage
+S3_STORAGE_LINUX_MODULES=$BASE_S3_STORAGE/modules/linux/$KERNEL_COMMIT_ID.$BUILD_DEVICE.linux.modules.tar.gz
+S3_STORAGE_LTTNG_MODULES=$BASE_S3_STORAGE/modules/lttng/$KERNEL_COMMIT_ID-$LTTNG_MODULES_COMMIT_ID.$BUILD_DEVICE.lttng.modules.tar.gz
 
 echo "BASE_S3_STORAGE=$BASE_S3_STORAGE" >> properties.txt
 echo "S3_STORAGE_KERNEL_FOLDER=$BASE_S3_STORAGE/kernel/" >> properties.txt
-echo "S3_STORAGE_KERNEL_IMAGE=$BASE_S3_STORAGE/kernel/$KERNEL_COMMIT_ID.$BUILD_DEVICE.bzImage" >> properties.txt
-echo "S3_STORAGE_LINUX_MODULES=$BASE_S3_STORAGE/modules/linux/$KERNEL_COMMIT_ID.$BUILD_DEVICE.linux.modules.tar.gz" >> properties.txt
-echo "S3_STORAGE_LTTNG_MODULES=$BASE_S3_STORAGE/modules/lttng/$KERNEL_COMMIT_ID-$LTTNG_MODULES_COMMIT_ID.$BUILD_DEVICE.lttng.modules.tar.gz" >> properties.txt
+echo "S3_STORAGE_KERNEL_IMAGE=$S3_STORAGE_KERNEL_IMAGE" >> properties.txt
+echo "S3_STORAGE_LINUX_MODULES=$S3_STORAGE_LINUX_MODULES" >> properties.txt
+echo "S3_STORAGE_LTTNG_MODULES=$S3_STORAGE_LTTNG_MODULES" >> properties.txt
+
+# Generate S3 https url directly
+echo "S3_URL_KERNEL_IMAGE=${BASE_S3_URL}/$S3_STORAGE_KERNEL_IMAGE" >> properties.txt
+echo "S3_URL_LINUX_MODULES=${BASE_S3_URL}/$S3_STORAGE_LINUX_MODULES" >> properties.txt
+echo "S3_URL_LTTNG_MODULES=${BASE_S3_URL}/$S3_STORAGE_LTTNG_MODULES" >> properties.txt