Rebase LTS/ELTS changes on top of the Salsa CI's pipeline as of 2024-04-23
Closed
Rebase LTS/ELTS changes on top of the Salsa CI's pipeline as of 2024-04-23
rebase-2024-04-23
into
master
1 unresolved thread
1 unresolved thread
This MR overrides !12 (closed)
My goal with this MR is to simplify and squash the commits, keeping in mind to parts of code that could be merged upstream.
I gave up the idea of doing a "clean" rebase, as it was my goal with !12 (closed) (we are "88 commits behind, 118 commits ahead"). It is too complex and we don't gain too much. I haven't been able to finish that since last November, so just let's make it simple. We need to import some changes from upstream to fix long-standing issues in our fork.
Merge request reports
Activity
added 17 commits
- 4647cc85...b48eb13c - 7 earlier commits
- a21bffc9 - elts: pre-ship the ELTS archive key
- 369dfb05 - Freexian related changes to images/files/base/initialize
- b239ab54 - Adapt build job to lts-team in salsa-ci.yml
- 442598c5 - Adapt reprotest job to lts-team in salsa-ci.yml
- d0b45ed2 - Add autopkgtest-novirt job in pipeline-jobs.yml
- 667d5ee8 - Include LTS Team pipeline in recipes/debian.yml
- 260b3406 - Add .images-elts.yml and .images-lts.yml
- aea83bf2 - Add recipes/ and vars/ related to LTS and ELTS releases
- 558d2791 - Adapt README.md to the LTS Team pipeline
- 7be79ff1 - Override VENDOR with debian to build the base image
Toggle commit listadded 18 commits
- ad834832...711311d8 - 8 earlier commits
- 08ce45e8 - Freexian related changes to images/files/base/initialize
- c22071f4 - Adapt build job to lts-team in salsa-ci.yml
- 47eb4b66 - TBR: fix BUILD_COMMAND
- d7e1c845 - Adapt reprotest job to lts-team in salsa-ci.yml
- 9fd2bef3 - Add autopkgtest-novirt job in pipeline-jobs.yml
- 7471b63b - Include LTS Team pipeline in recipes/debian.yml
- 1e998e23 - Add .images-elts.yml and .images-lts.yml
- afdd71ee - Add recipes/ and vars/ related to LTS and ELTS releases
- 2f3a9296 - Adapt README.md to the LTS Team pipeline
- 448431d3 - Override VENDOR with debian to build the base image
Toggle commit listadded 18 commits
- 10970278...b643f9cc - 8 earlier commits
- cd574294 - TBR: fix BUILD_COMMAND
- 353adbf9 - Adapt reprotest job to lts-team in salsa-ci.yml
- 06531306 - Add autopkgtest-novirt job in pipeline-jobs.yml
- 96e0c72d - Include LTS Team pipeline in recipes/debian.yml
- e0c8f463 - Add .images-elts.yml and .images-lts.yml
- 59e2875d - Add recipes/ and vars/ related to LTS and ELTS releases
- ea3ff94c - Adapt README.md to the LTS Team pipeline
- 19a5c4b8 - Override VENDOR with debian to build the base image
- ebae0394 - TBD: make images persistent
- c8086c90 - TBD: disable building images
Toggle commit listadded 22 commits
- c8086c90...dcc1655b - 12 earlier commits
- fac63823 - TBR: fix BUILD_COMMAND
- 33fd2e7f - Adapt reprotest job to lts-team in salsa-ci.yml
- 26c251ee - Add autopkgtest-novirt job in pipeline-jobs.yml
- 554665e5 - Include LTS Team pipeline in recipes/debian.yml
- 76145102 - Add .images-elts.yml and .images-lts.yml
- 073981fc - Add recipes/ and vars/ related to LTS and ELTS releases
- eafb0b07 - Adapt README.md to the LTS Team pipeline
- c7bf5053 - Override VENDOR with debian to build the base image
- 66c9a259 - TBD: make images persistent
- eec3a1f7 - TBD: disable building images
Toggle commit listmentioned in merge request !15 (closed)
Superseded by !15 (closed)
385 385 elif [ "$DB_BUILD_TYPE" = "all" ]; then 386 386 JESSIE_BUILD_OPTION=-A 387 387 fi 388 BUILD_COMMAND="${BUILD_COMMAND} ${JESSIE_BUILD_OPTION} ${DB_BUILD_PARAM}" 388 fi 389 BUILD_COMMAND="${BUILD_COMMAND} ${JESSIE_BUILD_OPTION} ${DB_BUILD_PARAM}" 389 390
Please register or sign in to reply