Merge remote-tracking branch 'upstream/main' into feat/postgres

Author: rjsparks

.github/workflows/build.yml

@@ -380,10 +380,11 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Update Baseline Coverage
-      uses: ncipollo/release-action@v1.11.1
+      uses: ncipollo/release-action@v1.12.0
       if: ${{ github.event.inputs.updateCoverage == 'true' && github.event.inputs.dryrun == 'false' }}
       with:
         allowUpdates: true
+        makeLatest: true
         tag: baseline
         omitBodyDuringUpdate: true
         omitNameDuringUpdate: true
@@ -417,7 +418,7 @@ jobs:
     name: Deploy to Sandbox
     if: ${{ always() && github.event.inputs.sandbox == 'true' }}
     needs: [prepare, release]
-    runs-on: dev-server
+    runs-on: [self-hosted, dev-server]
     env:
       PKG_VERSION: ${{needs.prepare.outputs.pkg_version}}
 

.github/workflows/dev-assets-sync-nightly.yml

@@ -49,7 +49,7 @@ jobs:
   sync:
     name: Run assets rsync
     if: ${{ always() }}
-    runs-on: dev-server
+    runs-on: [self-hosted, dev-server]
     needs: [build]
     steps:
     - name: Run rsync

dev/deploy-to-container/cli.js

@@ -155,6 +155,19 @@ async function main () {
   } else {
     console.info('Existing assets docker volume found.')
   }
+  
+  // Get shared test docker volume
+  console.info('Querying shared test docker volume...')
+  try {
+    const testVolume = await dock.getVolume(`dt-test-${branch}`)
+    console.info('Attempting to delete any existing shared test docker volume...')
+    await testVolume.remove({ force: true })
+  } catch (err) {}
+  console.info('Creating new shared test docker volume...')
+  await dock.createVolume({
+    Name: `dt-test-${branch}`
+  })
+  console.info('Created shared test docker volume successfully.')
 
   // Create DB container
   console.info(`Creating DB docker container... [dt-db-${branch}]`)
@@ -211,7 +224,8 @@ async function main () {
       ],
       HostConfig: {
         Binds: [
-          'dt-assets:/assets'
+          'dt-assets:/assets',
+          `dt-test-${branch}:/test`
         ],
         Init: true,
         NetworkMode: 'shared',
@@ -243,7 +257,8 @@ async function main () {
     },
     HostConfig: {
       Binds: [
-        'dt-assets:/assets'
+        'dt-assets:/assets',
+        `dt-test-${branch}:/test`
       ],
       NetworkMode: 'shared',
       RestartPolicy: {

dev/deploy-to-container/settings_local.py

@@ -21,11 +21,11 @@
 CELERY_BROKER_URL = '__MQCONNSTR__'
 
 IDSUBMIT_IDNITS_BINARY = "/usr/local/bin/idnits"
-IDSUBMIT_REPOSITORY_PATH = "test/id/"
-IDSUBMIT_STAGING_PATH = "test/staging/"
-INTERNET_DRAFT_ARCHIVE_DIR = "test/archive/"
-INTERNET_ALL_DRAFTS_ARCHIVE_DIR = "test/archive/"
-RFC_PATH = "test/rfc/"
+IDSUBMIT_REPOSITORY_PATH = "/test/id/"
+IDSUBMIT_STAGING_PATH = "/test/staging/"
+INTERNET_DRAFT_ARCHIVE_DIR = "/test/archive/"
+INTERNET_ALL_DRAFTS_ARCHIVE_DIR = "/test/archive/"
+RFC_PATH = "/test/rfc/"
 
 AGENDA_PATH = '/assets/www6s/proceedings/'
 MEETINGHOST_LOGO_PATH = AGENDA_PATH
@@ -67,6 +67,6 @@
 INTERNET_ALL_DRAFTS_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/'
 
 NOMCOM_PUBLIC_KEYS_DIR = 'data/nomcom_keys/public_keys/'
-SLIDE_STAGING_PATH = 'test/staging/'
+SLIDE_STAGING_PATH = '/test/staging/'
 
 DE_GFM_BINARY = '/usr/local/bin/de-gfm'

dev/deploy-to-container/start.sh

@@ -1,5 +1,19 @@
 #!/bin/bash
 
+echo "Creating /test directories..."
+for sub in \
+    /test/id \
+    /test/staging \
+    /test/archive \
+    /test/rfc \
+    /test/media \
+    /test/wiki/ietf \
+    ; do
+    if [ ! -d "$sub"  ]; then
+        echo "Creating dir $sub"
+        mkdir -p "$sub";
+    fi
+done
 echo "Fixing permissions..."
 chmod -R 777 ./
 echo "Ensure all requirements.txt packages are installed..."

ietf/ipr/views.py

@@ -296,7 +296,7 @@ def edit(request, id, updates=None):
     ipr = get_object_or_404(IprDisclosureBase, id=id).get_child()
     type = class_to_type[ipr.__class__.__name__]
 
-    DraftFormset = inlineformset_factory(IprDisclosureBase, IprDocRel, form=DraftForm, can_delete=True, extra=1)
+    DraftFormset = inlineformset_factory(IprDisclosureBase, IprDocRel, form=DraftForm, can_delete=True, extra=0)
 
     if request.method == 'POST':
         form = ipr_form_mapping[ipr.__class__.__name__](request.POST,instance=ipr)
@@ -316,7 +316,7 @@ def edit(request, id, updates=None):
         else:
             valid_formsets = True
 
-        if form.is_valid() and valid_formsets: 
+        if form.is_valid() and valid_formsets:
             updates = form.cleaned_data.get('updates')
             disclosure = form.save(commit=False)
             disclosure.save()