Merge branch 'release_21.09' into dev

.github/workflows/first_startup.yaml

@@ -1,10 +1,10 @@
 name: first startup
 on: [push, pull_request]
+env:
+  YARN_INSTALL_OPTS: --frozen-lockfile
 concurrency:
   group: first-startup-${{ github.ref }}
   cancel-in-progress: true
-env:
-  YARN_INSTALL_OPTS: --frozen-lockfile
 jobs:
 
   test:

.github/workflows/framework.yaml

@@ -1,12 +1,11 @@
 name: Framework tests
 on: [push, pull_request]
 env:
+  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
   GALAXY_TEST_RAISE_EXCEPTION_ON_HISTORYLESS_HDA: '1'
 concurrency:
   group: framework-${{ github.ref }}
   cancel-in-progress: true
-env:
-  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
 jobs:
   test:
     name: Test

.github/workflows/integration.yaml

@@ -1,12 +1,12 @@
 name: Integration
 on: [push, pull_request]
+env:
+  GALAXY_TEST_AMQP_URL: 'amqp://localhost:5672//'
+  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
+  GALAXY_TEST_RAISE_EXCEPTION_ON_HISTORYLESS_HDA: '1'
 concurrency:
   group: integration-${{ github.ref }}
   cancel-in-progress: true
-env:
-  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
-  GALAXY_TEST_AMQP_URL: 'amqp://localhost:5672//'
-  GALAXY_TEST_RAISE_EXCEPTION_ON_HISTORYLESS_HDA: '1'
 jobs:
   test:
     name: Test

.github/workflows/integration_selenium.yaml

@@ -1,14 +1,14 @@
 name: Integration Selenium
 on: [push, pull_request]
+env:
+  GALAXY_SKIP_CLIENT_BUILD: '0'
+  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
+  GALAXY_TEST_RAISE_EXCEPTION_ON_HISTORYLESS_HDA: '1'
+  GALAXY_TEST_SELENIUM_RETRIES: 1
+  YARN_INSTALL_OPTS: --frozen-lockfile
 concurrency:
   group: integration-selenium-${{ github.ref }}
   cancel-in-progress: true
-env:
-  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
-  GALAXY_SKIP_CLIENT_BUILD: '0'
-  GALAXY_TEST_SELENIUM_RETRIES: 1
-  YARN_INSTALL_OPTS: --frozen-lockfile
-  GALAXY_TEST_RAISE_EXCEPTION_ON_HISTORYLESS_HDA: '1'
 jobs:
   test:
     name: Test

.github/workflows/performance.yaml

@@ -1,10 +1,10 @@
 name: Performance tests
 on: [push, pull_request]
+env:
+  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
 concurrency:
   group: performance-${{ github.ref }}
   cancel-in-progress: true
-env:
-  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
 jobs:
   test:
     name: Test

.github/workflows/selenium.yaml

@@ -1,14 +1,14 @@
 name: Selenium tests
 on: [push, pull_request]
+env:
+  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
+  GALAXY_TEST_RAISE_EXCEPTION_ON_HISTORYLESS_HDA: '1'
+  GALAXY_TEST_SELENIUM_RETRIES: 1
+  GALAXY_TEST_SKIP_FLAKEY_TESTS_ON_ERROR: 'true'
+  YARN_INSTALL_OPTS: --frozen-lockfile
 concurrency:
   group: selenium-${{ github.ref }}
   cancel-in-progress: true
-env:
-  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
-  GALAXY_TEST_SKIP_FLAKEY_TESTS_ON_ERROR: 'true'
-  GALAXY_TEST_SELENIUM_RETRIES: 1
-  YARN_INSTALL_OPTS: --frozen-lockfile
-  GALAXY_TEST_RAISE_EXCEPTION_ON_HISTORYLESS_HDA: '1'
 jobs:
   test:
     name: Test

.github/workflows/toolshed.yaml

@@ -1,11 +1,11 @@
 name: Toolshed tests
 on: [push, pull_request]
-concurrency:
-  group: toolshed-${{ github.ref }}
-  cancel-in-progress: true
 env:
   GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
   TOOL_SHED_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/toolshed?client_encoding=utf8'
+concurrency:
+  group: toolshed-${{ github.ref }}
+  cancel-in-progress: true
 jobs:
   test:
     name: Test

lib/galaxy/workflow/run_request.py

@@ -218,6 +218,7 @@ def _get_target_history(trans, workflow, payload, param_keys=None, index=0):
             nh_name = f"{nh_name} on {', '.join(ids[0:-1])} and {ids[-1]}"
         new_history = trans.app.model.History(user=trans.user, name=nh_name)
         trans.sa_session.add(new_history)
+        trans.sa_session.flush()
         target_history = new_history
     return target_history