upload index.html

scripts/live_test/generate_index.py

@@ -7,36 +7,45 @@
 Generate index.html of testing results HTML pages.
 """
 import traceback
+import os
 import requests
 import xml.etree.ElementTree as ET
 
 
-def generate(container_url):
+def generate(container, container_url):
+    """
+    Generate index.html. Upload it to storage account
+    :param container:
+    :param container_url:
+    :return:
+    """
     data = []
     url = container_url + '?restype=container&comp=list'
-    try:
-        content = requests.get(url).content
-        # print(content)
-        root = ET.fromstring(content)
-        for blobs in root:
-            for blob in blobs:
-                name = url = ''
-                for e in blob:
-                    if e.tag == 'Name':
-                        name = e.text
-                    if e.tag == 'Url':
-                        url = e.text
-                if name == '' or url == '':
-                    print('Warning, name: {}, ')
-                if name.endswith('.html'):
-                    data.append({'name': name, 'url': url})
-            break
-        print(data)
-        html = render(data, container_url)
-        with open('index.html', 'w') as f:
-            f.write(html)
-    except:
-        traceback.print_exc()
+    content = requests.get(url).content
+    # print(content)
+    root = ET.fromstring(content)
+    for blobs in root:
+        for blob in blobs:
+            name = url = ''
+            for e in blob:
+                if e.tag == 'Name':
+                    name = e.text
+                if e.tag == 'Url':
+                    url = e.text
+            if name == '' or url == '':
+                print('Warning, name: {}, ')
+            if name.endswith('.html'):
+                data.append({'name': name, 'url': url})
+        break
+    print(data)
+    html = render(data, container_url)
+    with open('index.html', 'w') as f:
+        f.write(html)
+
+    # Upload to storage account
+    cmd = 'az storage blob upload -f index.html -c {} -n index.html --account-name clitestresultstac'.format(container)
+    print('Running: ' + cmd)
+    os.system(cmd)
 
 
 def render(data, container_url):
@@ -71,4 +80,7 @@ def render(data, container_url):
 
 if __name__ == '__main__':
     url = 'https://clitestresultstac.blob.core.windows.net/20200919213646live'
-    generate(url)
+    try:
+        generate(url)
+    except:
+        traceback.print_exc()

scripts/live_test/sendemail.py

@@ -10,6 +10,7 @@
 import random
 import string
 import test_data
+import generate_index
 
 
 SENDGRID_KEY = sys.argv[1]
@@ -60,6 +61,13 @@ def main():
     except Exception:
         print(traceback.format_exc())
 
+    # Generate index.html
+    try:
+        container_url = 'https://clitestresultstac.blob.core.windows.net/' + container
+        generate_index.generate(container, container_url)
+    except Exception:
+        print(traceback.format_exc())
+
     # Write database
     try:
         write_db(container, testdata)
@@ -131,7 +139,6 @@ def write_db(container, testdata):
       PRIMARY KEY (`id`),
       UNIQUE KEY `repr` (`repr`)
     );
-
     """
     print('Enter write_db()')
 
@@ -155,7 +162,7 @@ def write_db(container, testdata):
     fail = testdata.total[2]
     rate = testdata.total[3]
     detail = str(testdata.modules)
-    container = 'https://clitestresultstac.blob.core.windows.net/' + container
+    container = 'https://clitestresultstac.blob.core.windows.net/{}/index.html'.format(container)
     d = datetime.datetime.now()
     date = d.strftime('%Y%m%d')
     time = d.strftime('%H%M%S')