jjb/lava: Parametrize URL for system-test's root FS

Change-Id: I75f21e32241b1bfe1d0eefc47433294f0fc10b1c

diff --git a/jobs/system-tests.yaml b/jobs/system-tests.yaml
index 1b0f20d377b6b702599f24d4a6bf5ceeb7481f9d..57cba7f2276b071f161225384fe3483e76841aa9 100644 (file)
--- a/jobs/system-tests.yaml
+++ b/jobs/system-tests.yaml
@@ -35,6 +35,10 @@
           name: 'LTTNG_UST_REPO'
           default: 'https://github.com/lttng/lttng-ust.git'
           description: 'LTTng-UST git repo to checkout the UST id'
+      - string:
+          name: 'ROOTFS_URL'
+          default: 'https://obj.internal.efficios.com/lava/rootfs/rootfs_amd64_xenial_2018-12-05.tar.gz'
+          description: 'The URL at which the system root FS can be downloaded'
 
 - publisher:
     name: 'system_tests_email_ext_default'

diff --git a/scripts/system-tests/generate-properties-master.sh b/scripts/system-tests/generate-properties-master.sh
index 449748f38e5a26e8fd42d9d10c15f28f12d1b8de..758a488e7b174bad3a3c0a6b463df9ce5ede4c5d 100644 (file)
--- a/scripts/system-tests/generate-properties-master.sh
+++ b/scripts/system-tests/generate-properties-master.sh
@@ -48,6 +48,7 @@ echo "BUILD_DEVICE=$BUILD_DEVICE" >> properties.txt
 echo "LTTNG_VERSION=$LTTNG_VERSION" >> properties.txt
 echo "KGITREPO=$KERNEL_REPO" >> properties.txt
 echo "LTTNG_MODULES_REPO=$LTTNG_MODULES_REPO" >> properties.txt
+echo "ROOTFS_URL=$ROOTFS_URL" >> properties.txt
 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

diff --git a/scripts/system-tests/lava2-submit.py b/scripts/system-tests/lava2-submit.py
index 6895cc2bb72ad8e0e84bf0acfa505614a183cb60..232be5d43bb72016c08e5012bfe2d4702b9627c1 100644 (file)
--- a/scripts/system-tests/lava2-submit.py
+++ b/scripts/system-tests/lava2-submit.py
@@ -182,7 +182,6 @@ def get_vlttng_cmd(
 
 def main():
     send_retry_limit = 10
-    nfsrootfs = "https://obj.internal.efficios.com/lava/rootfs/rootfs_amd64_xenial_2018-12-05.tar.gz"
     test_type = None
     parser = argparse.ArgumentParser(description='Launch baremetal test using Lava')
     parser.add_argument('-t', '--type', required=True)
@@ -196,6 +195,10 @@ def main():
     parser.add_argument('-uu', '--ust-url', required=False)
     parser.add_argument('-uc', '--ust-commit', required=False)
     parser.add_argument('-d', '--debug', required=False, action='store_true')
+    parser.add_argument(
+        '-r', '--rootfs-url', required=False,
+        default="https://obj.internal.efficios.com/lava/rootfs/rootfs_amd64_xenial_2018-12-05.tar.gz"
+    )
     args = parser.parse_args()
 
     if args.type not in TestType.values:
@@ -256,7 +259,7 @@ def main():
     context['lttng_version_string'] = lttng_version_string
 
     context['kernel_url'] = args.kernel
-    context['nfsrootfs_url'] = nfsrootfs
+    context['nfsrootfs_url'] = args.rootfs_url
     context['lttng_modules_url'] = args.lmodule
     context['jenkins_build_id'] = args.build_id
 

diff --git a/scripts/system-tests/run-baremetal-tests.sh b/scripts/system-tests/run-baremetal-tests.sh
index 5ccc781990c9f80d17ba8282210c814ac334254a..32ead9a53c3f056d7ea26abbdc7262aec8670a26 100644 (file)
--- a/scripts/system-tests/run-baremetal-tests.sh
+++ b/scripts/system-tests/run-baremetal-tests.sh
@@ -35,7 +35,8 @@ python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava2-submit.py \
                           -uu "$LTTNG_UST_REPO" \
                           -tc "$LTTNG_TOOLS_COMMIT_ID" \
                           -uc "$LTTNG_UST_COMMIT_ID" \
-                          -id "$BUILD_TAG"
+                          -id "$BUILD_TAG" \
+                          -r "$ROOTFS_URL"
 
 set +eu
 deactivate

diff --git a/scripts/system-tests/run-kvm-tests.sh b/scripts/system-tests/run-kvm-tests.sh
index 657810e1648fce27fda441601088e41aa8f7e0b0..7c36757f5636aa977e58bd453dcfe2277b06ac97 100644 (file)
--- a/scripts/system-tests/run-kvm-tests.sh
+++ b/scripts/system-tests/run-kvm-tests.sh
@@ -34,7 +34,8 @@ python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava2-submit.py \
                           -uu "$LTTNG_UST_REPO" \
                           -tc "$LTTNG_TOOLS_COMMIT_ID" \
                           -uc "$LTTNG_UST_COMMIT_ID" \
-                          -id "$BUILD_TAG"
+                          -id "$BUILD_TAG" \
+                          -r "$ROOTFS_URL"
 
 set +eu
 deactivate