CI: don't upgrade hub in test containers

crowdsecurity · Jan 31, 2024 · abdefa6 · abdefa6
1 parent 578d66e
commit abdefa6
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 68 deletions.
diff --git a/docker/README.md b/docker/README.md
@@ -316,6 +316,7 @@ config.yaml) each time the container is run.
 | `BOUNCERS_ALLOWED_OU`   | bouncer-ou | OU values allowed for bouncers, separated by comma |
 |                         | | |
 | __Hub management__      | | |
+| `NO_HUB_UPGRADE`        | false | Skip hub update / upgrade when the container starts |
 | `COLLECTIONS`           | | Collections to install, separated by space: `-e COLLECTIONS="crowdsecurity/linux crowdsecurity/apache2"` |
 | `PARSERS`               | | Parsers to install, separated by space |
 | `SCENARIOS`             | | Scenarios to install, separated by space |

diff --git a/docker/docker_start.sh b/docker/docker_start.sh
@@ -303,8 +303,12 @@ fi
 conf_set_if "$PLUGIN_DIR" '.config_paths.plugin_dir = strenv(PLUGIN_DIR)'
 
 ## Install hub items
+
 cscli hub update || true
-cscli hub upgrade || true
+
+if isfalse "$NO_HUB_UPGRADE"; then
+    cscli hub upgrade || true
+fi
 
 cscli_if_clean parsers install crowdsecurity/docker-logs
 cscli_if_clean parsers install crowdsecurity/cri-logs

diff --git a/docker/test/Pipfile b/docker/test/Pipfile
@@ -1,7 +1,7 @@
 [packages]
 pytest-dotenv = "0.5.2"
 pytest-xdist = "3.5.0"
-pytest-cs = {ref = "0.7.18", git = "https://github.com/crowdsecurity/pytest-cs.git"}
+pytest-cs = {ref = "0.7.19", git = "https://github.com/crowdsecurity/pytest-cs.git"}
 
 [dev-packages]
 gnureadline = "8.1.2"

diff --git a/docker/test/Pipfile.lock b/docker/test/Pipfile.lock