From 98d77fed23af1eaaaa6a556aead5cfa658e3e341 Mon Sep 17 00:00:00 2001 From: didayolo Date: Tue, 14 Mar 2023 16:35:14 +0100 Subject: [PATCH 1/6] Update .env_sample --- .env_sample | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env_sample b/.env_sample index 7a5e06992..ce6916ef1 100644 --- a/.env_sample +++ b/.env_sample @@ -9,7 +9,7 @@ DB_PORT=5432 DJANGO_SETTINGS_MODULE=settings.develop ALLOWED_HOSTS=localhost,example.com -SUBMISSIONS_API_URL=http://localhost/api +SUBMISSIONS_API_URL=http://django:8000/api # Local domain definition DOMAIN_NAME=localhost:80 @@ -56,7 +56,7 @@ AWS_SECRET_ACCESS_KEY=testsecret AWS_STORAGE_BUCKET_NAME=public AWS_STORAGE_PRIVATE_BUCKET_NAME=private # NOTE! port 9000 here should match $MINIO_PORT -AWS_S3_ENDPOINT_URL=http://localhost:9000/ +AWS_S3_ENDPOINT_URL=http://minio:9000/ AWS_QUERYSTRING_AUTH=False # # S3 storage example From 040d5da07403a558fc95243619513ac8bffae657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20Pav=C3=A3o?= Date: Tue, 21 Mar 2023 17:44:37 +0100 Subject: [PATCH 2/6] Update docker-compose.yml --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 38b05b8d4..fbe4e502e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -70,10 +70,10 @@ services: /bin/sh -c " set -x while ! nc -z minio 9000; echo 'Waiting for minio to startup...' && sleep 0.1; sleep 3; - until (/usr/bin/mc config host add minio_docker http://minio:$MINIO_PORT $MINIO_ACCESS_KEY $MINIO_SECRET_KEY) do echo '...waiting...' && sleep 1; done; + until (/usr/bin/mc config host add minio_docker http://minio:$MINIO_PORT $MINIO_ACCESS_KEY $MINIO_SECRET_KEY) do echo '...waiting...' && sleep 3; done; /usr/bin/mc mb minio_docker/$AWS_STORAGE_BUCKET_NAME; /usr/bin/mc mb minio_docker/$AWS_STORAGE_PRIVATE_BUCKET_NAME; - /usr/bin/mc policy set download minio_docker/$AWS_STORAGE_BUCKET_NAME; + /usr/bin/mc anonymous set download minio_docker/$AWS_STORAGE_BUCKET_NAME; exit 0; " From a8c8629c82bbe2b0d78763f379d50b0f2c3adc79 Mon Sep 17 00:00:00 2001 From: bbearce Date: Thu, 23 Mar 2023 14:54:18 +0000 Subject: [PATCH 3/6] announcement srevice interruption --- src/templates/pages/home.html | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/templates/pages/home.html b/src/templates/pages/home.html index 2164e4691..8bf0f0676 100644 --- a/src/templates/pages/home.html +++ b/src/templates/pages/home.html @@ -15,6 +15,25 @@

BETA

{% endblock %} {% block content %} +
+
+

Announcement

+
+
+
+

+ +

+
+

There is a planned maintenance for storage servers connected to Codalab.lisn.fr and codabench.org in Paris-Saclay.

+

Service will be interrupted from March, 28th 8:00 CET to approximately 15:00 CET.

+

Portal will be accessible read-only: NO submission can be processed. We apologize for inconvenience.

+

your Codalab Team

+
+
+
+
+
From 4a98eff4d8d76c8f5b2cb77493236aff8b03e400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20Pav=C3=A3o?= Date: Thu, 23 Mar 2023 15:57:40 +0100 Subject: [PATCH 4/6] Update test_competitions.py --- src/tests/functional/test_competitions.py | 33 ++++++++++++----------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/src/tests/functional/test_competitions.py b/src/tests/functional/test_competitions.py index 99c2e34dc..47d1635f5 100644 --- a/src/tests/functional/test_competitions.py +++ b/src/tests/functional/test_competitions.py @@ -11,6 +11,9 @@ from tasks.models import Task from ..utils import SeleniumTestCase +SHORT_WAIT = 0.1 +LONG_WAIT = 2 + class TestCompetitions(SeleniumTestCase): def setUp(self): @@ -64,8 +67,8 @@ def test_manual_competition_creation(self): self.execute_script('$("select[selenium=\'type\']").dropdown("set selected", "scoring_program")') self.find('input-file[selenium="file"] input').send_keys(os.path.join(self.test_files_dir, 'scoring_program.zip')) self.find('i[selenium="upload"]').click() - - sleep(2) + sleep(LONG_WAIT) + # Task Creation self.find('div[data-tab="tasks"]').click() self.find('div[selenium="create-task"]').click() @@ -73,7 +76,7 @@ def test_manual_competition_creation(self): self.find('textarea[selenium="task-desc"]').send_keys('textbox') self.find('div[data-tab="data"]').click() self.find('input[id="scoring_program"]').send_keys('sco') - sleep(.5) + sleep(LONG_WAIT) self.execute_script('$("div[selenium=\'scoring-program\'] a")[0].click()') self.find('div[selenium="save-task"]').click() @@ -87,7 +90,7 @@ def test_manual_competition_creation(self): # Participation Tab self.find('a[data-tab="participation"]').click() self.execute_script('$("textarea[ref=\'terms\']")[0].EASY_MDE.value("pArTiCiPaTe")') - sleep(2) + sleep(LONG_WAIT) self.find('input[selenium="auto-approve"]').click() # Pages Tab @@ -95,25 +98,25 @@ def test_manual_competition_creation(self): self.find('i[class="add icon"]').click() self.find('input[selenium="title"]').send_keys('Title') self.execute_script('$("textarea[ref=\'content\']")[0].EASY_MDE.value("Testing123")') - sleep(1) + sleep(LONG_WAIT) self.find('div[selenium="save1"]').click() - sleep(1) + sleep(LONG_WAIT) # Phases Tab self.find('a[data-tab="phases"]').click() self.find('i[selenium="add-phase"]').click() - sleep(1) + sleep(LONG_WAIT) self.find('form[selenium="phase-form"] input[name="name"]').send_keys('Name') - sleep(.1) + sleep(QUICK_WAIT) self.find('input[name="start"]').click() self.find('input[name="start"]').send_keys(2) self.find('input[name="start"]').send_keys(Keys.ENTER) self.find('input[name="end"]').send_keys(3) self.find('input[name="end"]').send_keys(Keys.ENTER) self.find('label[for="tasks"]').click() - sleep(.1) + sleep(QUICK_WAIT) self.find("form[selenium='phase-form'] input.search").send_keys("Wheat") - sleep(.1) + sleep(QUICK_WAIT) tasks = Task.objects.all() import random random_task = random.choice(tasks) @@ -121,9 +124,9 @@ def test_manual_competition_creation(self): self.find(f"form[selenium='phase-form'] .menu .item[data-value='{task}']").click() self.execute_script('$("textarea[ref=\'description\']")[0].EASY_MDE.value("Testing123")') self.find('form[selenium="phase-form"] input[name="name"]').send_keys('Name') - sleep(1) + sleep(LONG_WAIT) self.find('div[selenium="save2"]').click() - sleep(1) + sleep(LONG_WAIT) # Leaderboard Tab leaderboard_title = 'tItLe' @@ -132,12 +135,12 @@ def test_manual_competition_creation(self): self.find('input[selenium="title1"]').send_keys(leaderboard_title) self.find('input[selenium="key"]').send_keys('kEy') self.find('div[selenium="add-column"]').click() - sleep(1) + sleep(LONG_WAIT) self.find('input[selenium="column-key"]').send_keys('cOlUmN kEy') self.find('input[selenium="hidden"]').click() self.find('div[selenium="save3"]').click() - sleep(2) + sleep(LONG_WAIT) assert not Competition.objects.filter(title=competition_title).exists() self.find('button[selenium="save4"]').click() - sleep(1) + sleep(LONG_WAIT) assert Competition.objects.filter(title=competition_title).exists() From 4eea4ee5295b2f993aff9048734d230f860ef0f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20Pav=C3=A3o?= Date: Thu, 23 Mar 2023 16:03:50 +0100 Subject: [PATCH 5/6] Update test_competitions.py --- src/tests/functional/test_competitions.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tests/functional/test_competitions.py b/src/tests/functional/test_competitions.py index 47d1635f5..74edf63cd 100644 --- a/src/tests/functional/test_competitions.py +++ b/src/tests/functional/test_competitions.py @@ -107,16 +107,16 @@ def test_manual_competition_creation(self): self.find('i[selenium="add-phase"]').click() sleep(LONG_WAIT) self.find('form[selenium="phase-form"] input[name="name"]').send_keys('Name') - sleep(QUICK_WAIT) + sleep(SHORT_WAIT) self.find('input[name="start"]').click() self.find('input[name="start"]').send_keys(2) self.find('input[name="start"]').send_keys(Keys.ENTER) self.find('input[name="end"]').send_keys(3) self.find('input[name="end"]').send_keys(Keys.ENTER) self.find('label[for="tasks"]').click() - sleep(QUICK_WAIT) + sleep(SHORT_WAIT) self.find("form[selenium='phase-form'] input.search").send_keys("Wheat") - sleep(QUICK_WAIT) + sleep(SHORT_WAIT) tasks = Task.objects.all() import random random_task = random.choice(tasks) From a09d45d09bb167ebe0bbbc21fb6ac56075e6ea60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20Pav=C3=A3o?= Date: Thu, 23 Mar 2023 16:10:27 +0100 Subject: [PATCH 6/6] Fix formatting --- src/tests/functional/test_competitions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/functional/test_competitions.py b/src/tests/functional/test_competitions.py index 74edf63cd..cdbebe8a2 100644 --- a/src/tests/functional/test_competitions.py +++ b/src/tests/functional/test_competitions.py @@ -68,7 +68,7 @@ def test_manual_competition_creation(self): self.find('input-file[selenium="file"] input').send_keys(os.path.join(self.test_files_dir, 'scoring_program.zip')) self.find('i[selenium="upload"]').click() sleep(LONG_WAIT) - + # Task Creation self.find('div[data-tab="tasks"]').click() self.find('div[selenium="create-task"]').click()