Skip to content

Commit 400a830

Browse files
authored
chore: add bibxml-ids dir to container build. (ietf-tools#5590)
1 parent 2b1f248 commit 400a830

6 files changed

Lines changed: 10 additions & 13 deletions

File tree

dev/deploy-to-container/settings_local.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
IDSUBMIT_IDNITS_BINARY = "/usr/local/bin/idnits"
2424
IDSUBMIT_REPOSITORY_PATH = "/test/id/"
2525
IDSUBMIT_STAGING_PATH = "/test/staging/"
26-
INTERNET_DRAFT_ARCHIVE_DIR = "/test/archive/"
27-
INTERNET_ALL_DRAFTS_ARCHIVE_DIR = "/test/archive/"
28-
RFC_PATH = "/test/rfc/"
2926

3027
AGENDA_PATH = '/assets/www6s/proceedings/'
3128
MEETINGHOST_LOGO_PATH = AGENDA_PATH
@@ -65,6 +62,7 @@
6562
STATUS_CHANGE_PATH = '/assets/ietf-ftp/status-changes/'
6663
INTERNET_DRAFT_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/'
6764
INTERNET_ALL_DRAFTS_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/'
65+
BIBXML_BASE_PATH = '/assets/ietfdata/derived/bibxml'
6866

6967
NOMCOM_PUBLIC_KEYS_DIR = 'data/nomcom_keys/public_keys/'
7068
SLIDE_STAGING_PATH = '/test/staging/'

dev/diff/settings_local.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
IDSUBMIT_IDNITS_BINARY = "/usr/local/bin/idnits"
2121
IDSUBMIT_REPOSITORY_PATH = "test/id/"
2222
IDSUBMIT_STAGING_PATH = "test/staging/"
23-
INTERNET_DRAFT_ARCHIVE_DIR = "test/archive/"
24-
INTERNET_ALL_DRAFTS_ARCHIVE_DIR = "test/archive/"
25-
RFC_PATH = "test/rfc/"
2623

2724
AGENDA_PATH = '/assets/www6s/proceedings/'
2825
MEETINGHOST_LOGO_PATH = AGENDA_PATH
@@ -62,6 +59,7 @@
6259
STATUS_CHANGE_PATH = '/assets/ietf-ftp/status-changes/'
6360
INTERNET_DRAFT_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/'
6461
INTERNET_ALL_DRAFTS_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/'
62+
BIBXML_BASE_PATH = '/assets/ietfdata/derived/bibxml'
6563

6664
NOMCOM_PUBLIC_KEYS_DIR = 'data/nomcom_keys/public_keys/'
6765
SLIDE_STAGING_PATH = 'test/staging/'

dev/tests/settings_local.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
IDSUBMIT_IDNITS_BINARY = "/usr/local/bin/idnits"
2020
IDSUBMIT_REPOSITORY_PATH = "test/id/"
2121
IDSUBMIT_STAGING_PATH = "test/staging/"
22-
INTERNET_DRAFT_ARCHIVE_DIR = "test/archive/"
23-
INTERNET_ALL_DRAFTS_ARCHIVE_DIR = "test/archive/"
24-
RFC_PATH = "test/rfc/"
2522

2623
AGENDA_PATH = '/assets/www6s/proceedings/'
2724
MEETINGHOST_LOGO_PATH = AGENDA_PATH
@@ -61,6 +58,7 @@
6158
STATUS_CHANGE_PATH = '/assets/ietf-ftp/status-changes/'
6259
INTERNET_DRAFT_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/'
6360
INTERNET_ALL_DRAFTS_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/'
61+
BIBXML_BASE_PATH = '/assets/ietfdata/derived/bibxml'
6462

6563
NOMCOM_PUBLIC_KEYS_DIR = 'data/nomcom_keys/public_keys/'
6664
SLIDE_STAGING_PATH = 'test/staging/'

docker/configs/settings_local.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
IDSUBMIT_IDNITS_BINARY = "/usr/local/bin/idnits"
1111
IDSUBMIT_REPOSITORY_PATH = "test/id/"
1212
IDSUBMIT_STAGING_PATH = "test/staging/"
13-
INTERNET_DRAFT_ARCHIVE_DIR = "test/archive/"
14-
INTERNET_ALL_DRAFTS_ARCHIVE_DIR = "test/archive/"
15-
RFC_PATH = "test/rfc/"
1613

1714
AGENDA_PATH = '/assets/www6s/proceedings/'
1815
MEETINGHOST_LOGO_PATH = AGENDA_PATH
@@ -52,6 +49,7 @@
5249
STATUS_CHANGE_PATH = '/assets/ietf-ftp/status-changes/'
5350
INTERNET_DRAFT_ARCHIVE_DIR = '/assets/archive/id'
5451
INTERNET_ALL_DRAFTS_ARCHIVE_DIR = '/assets/archive/id'
52+
BIBXML_BASE_PATH = '/assets/ietfdata/derived/bibxml'
5553

5654
NOMCOM_PUBLIC_KEYS_DIR = 'data/nomcom_keys/public_keys/'
5755
SLIDE_STAGING_PATH = 'test/staging/'

docker/scripts/app-create-dirs.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ for sub in \
2121
/assets/ietf-ftp/yang/ianamod \
2222
/assets/ietf-ftp/yang/invalmod \
2323
/assets/ietf-ftp/yang/rfcmod \
24+
/assets/ietfdata \
25+
/assets/ietfdata/derived \
26+
/assets/ietfdata/derived/bibxml \
27+
/assets/ietfdata/derived/bibxml/bibxml-ids \
2428
/assets/www6s \
2529
/assets/www6s/staging \
2630
/assets/www6s/wg-descriptions \

ietf/utils/test_utils.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ class TestCase(django.test.TestCase):
210210
'INTERNET_ALL_DRAFTS_ARCHIVE_DIR',
211211
'INTERNET_DRAFT_ARCHIVE_DIR',
212212
'INTERNET_DRAFT_PATH',
213+
'BIBXML_BASE_PATH',
213214
]
214215

215216
parser = html5lib.HTMLParser(strict=True)
@@ -314,4 +315,4 @@ def tearDown(self):
314315
for dir in self._ietf_temp_dirs.values():
315316
shutil.rmtree(dir)
316317
self.requests_mock.stop()
317-
super().tearDown()
318+
super().tearDown()

0 commit comments

Comments
 (0)