Update docker to IPv6

This commit is contained in:
alesapin 2021-10-22 15:23:41 +03:00
parent e38f4e96d5
commit 649bfaf7e4
3 changed files with 43 additions and 10 deletions

View File

@ -32,6 +32,9 @@ table {{ border: 0; }}
.main {{ margin-left: 10%; }}
p.links a {{ padding: 5px; margin: 3px; background: #FFF; line-height: 2; white-space: nowrap; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.05), 0 8px 25px -5px rgba(0, 0, 0, 0.1); }}
th {{ cursor: pointer; }}
.failed {{ cursor: pointer; }}
.failed-content.open {{}}
.failed-content {{ display: none; }}
</style>
<title>{title}</title>
@ -44,14 +47,20 @@ th {{ cursor: pointer; }}
<a href="{raw_log_url}">{raw_log_name}</a>
<a href="{commit_url}">Commit</a>
{additional_urls}
<a href="{task_url}">Job (GitHub Actions)</a>
<a href="{task_url}">Task (github actions)</a>
</p>
{test_part}
</body>
<script type="text/javascript">
/// Straight from https://stackoverflow.com/questions/14267781/sorting-html-table-with-javascript
const getCellValue = (tr, idx) => tr.children[idx].innerText || tr.children[idx].textContent;
const getCellValue = (tr, idx) => {{
var classes = tr.classList;
var elem = tr;
if (classes.contains("failed-content") || classes.contains("failed-content.open"))
elem = tr.previousElementSibling;
return elem.children[idx].innerText || elem.children[idx].textContent;
}}
const comparer = (idx, asc) => (a, b) => ((v1, v2) =>
v1 !== '' && v2 !== '' && !isNaN(v1) && !isNaN(v2) ? v1 - v2 : v1.toString().localeCompare(v2)
@ -64,6 +73,12 @@ th {{ cursor: pointer; }}
.sort(comparer(Array.from(th.parentNode.children).indexOf(th), this.asc = !this.asc))
.forEach(tr => table.appendChild(tr) );
}})));
Array.from(document.getElementsByClassName("failed")).forEach(tr => tr.addEventListener('click', function() {{
var content = this.nextElementSibling;
content.classList.toggle("failed-content.open");
content.classList.toggle("failed-content");
}}));
</script>
</html>
"""
@ -107,13 +122,13 @@ def _get_status_style(status):
def _get_html_url(url):
if isinstance(url, str):
return '<a href="{url}">{name}</a>'.format(url=url, name=os.path.basename(url))
return '<a href="{url}">{name}</a>'.format(url=url, name=os.path.basename(url).replace('%2B', '+').replace('%20', ' '))
if isinstance(url, tuple):
return '<a href="{url}">{name}</a>'.format(url=url[0], name=url[1])
return '<a href="{url}">{name}</a>'.format(url=url[0], name=url[1].replace('%2B', '+').replace('%20', ' '))
return ''
def create_test_html_report(header, test_result, raw_log_url, task_url, branch_url, branch_name, commit_url, additional_urls=[]):
def create_test_html_report(header, test_result, raw_log_url, task_url, branch_url, branch_name, commit_url, additional_urls=[], with_raw_logs=False):
if test_result:
rows_part = ""
num_fails = 0
@ -134,11 +149,13 @@ def create_test_html_report(header, test_result, raw_log_url, task_url, branch_u
has_test_logs = True
row = "<tr>"
is_fail = test_status == "FAIL" or test_status == 'FLAKY'
if is_fail and with_raw_logs and test_logs is not None:
row = "<tr class=\"failed\">"
row += "<td>" + test_name + "</td>"
style = _get_status_style(test_status)
# Allow to quickly scroll to the first failure.
is_fail = test_status == "FAIL" or test_status == 'FLAKY'
is_fail_id = ""
if is_fail:
num_fails = num_fails + 1
@ -149,17 +166,23 @@ def create_test_html_report(header, test_result, raw_log_url, task_url, branch_u
if test_time is not None:
row += "<td>" + test_time + "</td>"
if test_logs is not None:
if test_logs is not None and not with_raw_logs:
test_logs_html = "<br>".join([_get_html_url(url) for url in test_logs])
row += "<td>" + test_logs_html + "</td>"
row += "</tr>"
rows_part += row
if test_logs is not None and with_raw_logs:
row = "<tr class=\"failed-content\">"
# TODO: compute colspan too
row += "<td colspan=\"3\"><pre>" + test_logs + "</pre></td>"
row += "</tr>"
rows_part += row
headers = BASE_HEADERS
if has_test_time:
headers.append('Test time, sec.')
if has_test_logs:
if has_test_logs and not with_raw_logs:
headers.append('Logs')
headers = ''.join(['<th>' + h + '</th>' for h in headers])
@ -235,7 +258,7 @@ tr:hover td {{filter: brightness(95%);}}
</table>
<p class="links">
<a href="{commit_url}">Commit</a>
<a href="{task_url}">Job (GitHub Actions)</a>
<a href="{task_url}">Task (github actions)</a>
</p>
</body>
</html>

View File

@ -27,6 +27,16 @@ apt-get install --yes --no-install-recommends docker-ce docker-ce-cli containerd
usermod -aG docker ubuntu
# enable ipv6 in containers (fixed-cidr-v6 is some random network mask)
cat <<EOT > /etc/docker/daemon.json
{
"ipv6": true,
"fixed-cidr-v6": "2001:db8:1::/64"
}
EOT
systemctl restart docker
pip install boto3 pygithub requests urllib3 unidiff
mkdir -p $RUNNER_HOME && cd $RUNNER_HOME

View File

@ -1 +1 @@
<clickhouse><listen_host>::</listen_host></clickhouse>
<clickhouse><listen_host>0.0.0.0</listen_host></clickhouse>