Skip to content
Snippets Groups Projects
  1. Aug 29, 2023
  2. Aug 28, 2023
  3. Aug 10, 2023
    • Tim Jaacks's avatar
      update_submodule: fix integration branch name in case of multiple MRs · 30f7d966
      Tim Jaacks authored
      When there are multiple open merge requests for a commit, we currently
      take the newest one to determine the integration branch name. This is
      not necessarily the correct one, we can have an open merge request with
      the commit being part of the commit history while the top commit is a
      different one.
      
      Add a check if the commit is the top commit of the merge request in
      order to get the correct integration branch name in these cases.
      30f7d966
  4. Aug 03, 2023
  5. Jul 21, 2023
  6. Mar 21, 2023
    • Tim Jaacks's avatar
      Use project path instead of name in integration branch name · e943a55e
      Tim Jaacks authored
      Usually project name and path are identical after project creation. It
      is possible, though, to change the name of a project without changing
      its path.
      When triggering a pipeline on the integration branch, we are using the
      CI_PROJECT_NAME variable to reference the project. Unexpectedly, this
      variable contains the *path*, not the *name* of the project (see
      https://gitlab.com/gitlab-org/gitlab/-/issues/20030).
      Hence we have to use the project path in all other places where the
      integration branch name is constructed in our Python code.
      e943a55e
  7. Nov 28, 2022
  8. Aug 29, 2022
    • Tim Jaacks's avatar
      Fix temporary dir path · 771dcff1
      Tim Jaacks authored
      We were passing the complete TemporaryDirectory object to the repo clone
      function instead of just the path string, resulting in the repo being
      cloned into a local dir "<TemporaryDirectory '/tmp/tmphwakypf8'>".
      
      Fix this to actually use the generated temp dir.
      
      This change makes it necessary to keep the TemporaryDirectory object
      reference until we don't need the directory anymore, otherwise it will
      be removed immediately.
      771dcff1
    • Tim Jaacks's avatar
      commit_and_push: do not pass branch · 1c9670d9
      Tim Jaacks authored
      Branch can be implicitly determined via the repo.
      1c9670d9
    • Tim Jaacks's avatar
      Create separate integration branches for each target branch · 399dd9f9
      Tim Jaacks authored
      This makes it possible to integrate a project branch into different
      branches of the same manifest project.
      399dd9f9
  9. Jun 13, 2022
  10. May 24, 2022
  11. May 20, 2022
  12. May 06, 2022
  13. Apr 12, 2022
    • Tim Jaacks's avatar
      Move repositories to git.seco.com · 1ba52853
      Tim Jaacks authored
      Rename variable JENKINSGUF_SSH_PRIVATE_KEY / SSH_PRIVATE_KEY to
      GITLAB_PRIVATE_KEY on this occasion, because it contains a private key
      that was generated exclusively for this use case. The according public
      key has been added as a deploy key in GitLab to all repositories that
      this repository needs access to.
      
      Add more detailed documentation concerning this configurationdirectly in
      the gitlab-ci files.
      1ba52853
  14. Apr 01, 2022
  15. Mar 31, 2022
    • Jonas Höppner's avatar
      CI: deploy_gitlab_ci: Rework the deployment of gitlab-ci into the child projects · 31d6d7da
      Jonas Höppner authored
      The deploy_gitlab_ci now creates the integration commit and branch in
      each passed subproject and create an integration commit in the manifest
      containing all these new revisions.
      A build is then triggered on this commit to test the functionality.
      
      Split the update_submodule functions to reuse them in different ways.
      Remove some previously used files.
      
      BCS 746-000740
      31d6d7da
  16. Mar 24, 2022
  17. Mar 18, 2022
    • Jonas Höppner's avatar
      CI: Update include file's ref in gitlab-ci.yml when deploying changes · 369e59b3
      Jonas Höppner authored
      Add update gitlab-ci file with function to adapt the include ref to a
      given revision.
      Add a 'pre-commit-hook' to the update-submodule function.
      Adapt deploy_gitlab_ci to use these to update the include statement in
      the base project .gitlab-ci.yml to use the same ref as the submodule
      is set to.
      
      BCS 746-000646
      369e59b3
  18. Mar 14, 2022
  19. Mar 01, 2022
  20. Dec 15, 2021
    • Tim Jaacks's avatar
      gitlab-ci: upgrade python image to 3.9 · 669113ff
      Tim Jaacks authored
      Fix pylint errors introduced with new pylint version:
      * unspecified-encoding: explicitly set encoding when opening a file
      * assigning-non-slot: use "set_reference()" function instead of assigning
        a value to the "reference" attribute
      * unused-variable: remove "e" variable on exceptions when not referenced
      669113ff
  21. Jun 29, 2021
    • Tim Jaacks's avatar
      update_submodule: fix accidental multi-commits · 01d10fab
      Tim Jaacks authored
      If integration branch already existed and had to be replaced, the new
      commit was accidentally pushed on top of the already existing commit
      instead of replacing it. Fixed this by checking out the master branch
      again before creating the commit.
      01d10fab
    • Tim Jaacks's avatar
      Add deploy stage · 00f04bda
      Tim Jaacks authored
      The jobs in the deploy stage have to be triggered manually in GitLab.
      There is one deploy job for each project which uses the gitlab-ci
      scripts as a submodule, so that the deployment can be performed step by
      step.
      
      If executed within MR context, an integration MR is created and left
      open. The user can extend this integration MR, e.g. if CI scripts have
      been renamed, changed command line arguments or other changes requiring
      updates of the correspronding .gitlab-ci.yml file. Subsequent runs of
      this job will re-create the integration branch, so manual changes are
      lost in this case.
      
      If executed on the master branch (i.e. after the source MR has been
      merged), the job does exactly the same, plus the integration MR will be
      automatically merged. If this fails, the job will fail as well.
      00f04bda
Loading