gitlab: remove instance-gitlab-test.cfg.in

software/gitlab/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [instance.cfg]
 filename = instance.cfg.in
-md5sum = 8e8edd7dadb9c331fdba826312e7e8d2
+md5sum = 8fabec3053c6453a0a4078ba89592da7
 
 [watcher]
 _update_hash_filename_ = watcher.in
@@ -60,10 +60,6 @@ md5sum = 0445e54ee7ce1f65ec79801e128c80d4
 _update_hash_filename_ = instance-gitlab-export.cfg.in
 md5sum = 9ed8220bb3ad71ff7e8638354127412c
 
-[instance-gitlab-test.cfg.in]
-_update_hash_filename_ = instance-gitlab-test.cfg.in
-md5sum = 7ba08928e6a8998ec8ed1bb97851b726
-
 [macrolib.cfg.in]
 _update_hash_filename_ = macrolib.cfg.in
 md5sum = a56a44e96f65f5ed20211bb6a54279f4

software/gitlab/instance-gitlab-test.cfg.in

-[buildout]
-extends = 
-  {{ instance_gitlab_export_cfg }}
-
-parts +=
-  install-demo-backup
-
-
-[root-password]
-passwd = root1234
-
-[service-unicorn]
-environment = 
-  GITLAB_ROOT_PASSWORD=${root-password:passwd}
-
-[service-postgresql]
-pgdata-directory = ${directory:srv}/pg
-
-[gitlab-workhorse-dir]
-recipe  = slapos.cookbook:mkdirectory
-srv     = ${directory:srv}/glab-wh
-
-[gitlab-workhorse]
-srv     = ${gitlab-workhorse-dir:srv}
-socket  = ${gitlab-workhorse:srv}/wh.socket
-
-[unicorn]
-socket  = ${:srv}/unc.socket
-
-[publish-instance-info]
-password = ${root-password:passwd}
-# token for default.user user in gitlab demo backup
-# Edit this token if needed
-private-token = SLurtnxPscPsU-SDm4oN
-# raw URL for latest commit on setup.py in gitlab demo backup.
-latest-file-uri = ${:backend_url}/open/slapos/raw/94c96d42c22e16836dadddac7c8061f4a8c6ca7a/setup.py
-
-[instance-parameter]
-# backup more often, 10 minutes seems the minimal
-configuration.backup_frequency  = */10 * * * *
-
-[install-demo-backup]
-recipe = plone.recipe.command
-stop-on-error = false
-backup-done = ${directory:var}/backup.ready
-command = 
-  if [ -f "${:backup-done}" ]; then
-    echo "Demo backup installed."
-  else
-    rm -rf ${secrets:secrets} ${directory:var}/backup/* &&
-    mkdir -p ${secrets:secrets} ${directory:var}/tmp &&
-    cp -r {{ gitlab_demo_backup_path }}/secrets/* ${secrets:secrets} &&
-    cp -rf {{ gitlab_demo_backup_path }}/backup-gitlab.git/ ${directory:var}/tmp &&
-    cd ${directory:var}/tmp/backup-gitlab.git/
-    PATH=${directory:bin}:{{ gopath_bin }}:{{ git_location }}/bin:$PATH
-    gitlab-backup restore -vupok -go HEAD &&
-    touch ${:backup-done}
-  fi
-update-command = ${:command}

software/gitlab/instance.cfg.in

@@ -128,11 +128,3 @@ url = ${instance-gitlab.cfg.in:target}
 url = ${instance-gitlab-export.cfg.in:target}
 context-extra =
     raw instance_gitlab_cfg         $${instance-gitlab.cfg:output}
-
-[instance-gitlab-test.cfg]
-<= instance-cfg
-url = ${instance-gitlab-test.cfg.in:target}
-context-extra =
-    raw instance_gitlab_cfg        $${instance-gitlab.cfg:output}
-    raw instance_gitlab_export_cfg $${instance-gitlab-export.cfg:output}
-    raw gitlab_demo_backup_path    ${gitlab-demo-backup.git:location}

software/gitlab/software.cfg

@@ -370,9 +370,6 @@ destination = ${buildout:directory}/${:_buildout_section_name_}
 [instance-gitlab-export.cfg.in]
 <= download-file
 
-[instance-gitlab-test.cfg.in]
-<= download-file
-
 [macrolib.cfg.in]
 <= download-file
 

[Jérome Perrin]

This might be causing a regression here: https://erp5js.nexedi.net/#/test_result_module/20230305-2D672DA3/24 can you please take a look ?

[Boxiang Sun]

Thanks for pointing it out. I created a MR to fix this issue: !1372 (merged)

The test is passed: https://erp5js.nexedi.net/#/test_result_module/20230306-C7BEDFEB

Sorry for that. @romain

[Jérome Perrin]

Thanks a lot, no need to be sorry :) this looks good to merge