Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
slapos
slapos
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Merge Requests 72
    • Merge Requests 72
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Jobs
  • Commits
  • nexedi
  • slaposslapos
  • Merge Requests
  • !1151

Merged
Opened Apr 09, 2022 by Thomas Leymonerie@tleymone
  • Report abuse
Report abuse

Update slapos.recipe.template key (url, inline, output)

I'm working on replacing slapos.recipe.template and slapos.recipe.template:jinja2 to harmonize the option keys (url, inline, output).

Here is the test suite for python 2 and for python 3

For Python 3, I think it's fine. But for Python 2, I have a problem with Caddy-Frontend, I have an error with the promise checking information (I think the "inline" option is interpreted differently than the "template = inline:" option).

I will try to modify the Caddy-Frontend files in steps to update the option names.

Edited Apr 28, 2022 by Thomas Leymonerie

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://lab.nexedi.com/tleymone/slapos.git replace-template
git checkout -b tleymone/slapos-replace-template FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/master
git merge --no-ff tleymone/slapos-replace-template

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 28
  • Commits 1
  • Pipelines 21
  • Changes 242
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: nexedi/slapos!1151

Revert this commit

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this commit

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7