X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fsystem-tests%2Fgenerate-properties-master.sh;h=5e7c4b01371dd1068a52e61d4802f4bf03b7ca41;hb=f3767d62ddfed84afaa1da4a3f3deacd90597306;hp=bb2e25b89502a977e1b5352c630c17b2a0fddcf6;hpb=7fa8d866cf930200963aabfa012241ced3046e4a;p=lttng-ci.git

diff --git a/scripts/system-tests/generate-properties-master.sh b/scripts/system-tests/generate-properties-master.sh
index bb2e25b..5e7c4b0 100644
--- a/scripts/system-tests/generate-properties-master.sh
+++ b/scripts/system-tests/generate-properties-master.sh
@@ -16,6 +16,19 @@
 
 touch properties.txt
 
+echo "# Setup endpoint
+host_base = obj.internal.efficios.com
+host_bucket = obj.internal.efficios.com
+bucket_location = us-east-1
+use_https = True
+
+# Setup access keys
+access_key = jenkins
+secret_key = echo123456
+
+# Enable S3 v4 signature APIs
+signature_v2 = False" > "$WORKSPACE/s3cfg"
+
 LTTNG_CI_PATH="$WORKSPACE/src/lttng-ci"
 echo "LTTNG_CI_PATH=$LTTNG_CI_PATH" >> properties.txt
 KERNEL_COMMIT_ID=$KERNEL_TAG_ID
@@ -37,3 +50,21 @@ echo "STORAGE_KERNEL_FOLDER=$BASE_STORAGE_FOLDER/kernel" >> properties.txt
 echo "STORAGE_KERNEL_IMAGE=$BASE_STORAGE_FOLDER/kernel/$KERNEL_COMMIT_ID.$BUILD_DEVICE.bzImage" >> properties.txt
 echo "STORAGE_LINUX_MODULES=$BASE_STORAGE_FOLDER/modules/linux/$KERNEL_COMMIT_ID.$BUILD_DEVICE.linux.modules.tar.gz" >> properties.txt
 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=$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