-
Notifications
You must be signed in to change notification settings - Fork 319
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Adding support for project templates #277
Adding support for project templates #277
Conversation
a204d8b
to
be3fb9d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 🚀
@armsnyder @roidelapluie if this is looking good can we get it merged? |
@ahmet2mir This needed a rebase so I went ahead and kept both changes (testAccGitlabProjectConfigTemplateName from this PR and testAccGitlabProjectConfigImportURL from master), WDYT? |
LGTM :)
Le lun. 14 sept. 2020 à 22:09, Serena Fang <[email protected]> a
écrit :
… @ahmet2mir <https://github.com/ahmet2mir> This needed a rebase so I went
ahead and kept both changes (testAccGitlabProjectConfigTemplateName from
this PR and testAccGitlabProjectConfigImportURL from master), WDYT?
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#277 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/ABZ2W7NGHCWCXVUBCPZS5QTSFZZ6FANCNFSM4LGHEDMQ>
.
|
The branch needed a rebase so I went ahead and rebased it, there was a small conflict that was easy to resolve (I kept both changes), which created a bunch of errors so I want to revert my merge. I'm getting this error though: " ! [remote rejected] project-template-support -> project-template-support (refusing to allow an OAuth App to create or update workflow |
5dfd9a6
to
dc76c5b
Compare
I will recreate, too much conflicts and my changes are not so big. I did a push force to remove the binary from history and now we have too much commits. |
dc76c5b
to
f5149ec
Compare
Found how to test EE features, see PR comment. |
@ahmet2mir Thanks for reopening, sorry again for messing up your branch! |
@ahmet2mir Do you need the new Also, I don't think we want to add any test-specific setup to the |
@armsnyder I don't need the env var, SkipFunc: isRunningInCE is what I missed. thanks. For It's the param I could only create the group, the project myrails based on rails, get the id and send to the tests but I can't change EE settings to declare the group as template.
|
05c7021
to
d439732
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for your work on this @ahmet2mir, I've left a few comments.
@ahmet2mir This looks good to me, thanks for working on it! Might be worth it to get another set of eyes on this before it goes in. @armsnyder Could you take a look? 😄 |
@ahmet2mir Thanks for the detailed response about the template group! @roidelapluie What do you think about the change to @sfang97 Sure I'll review. |
Also, just as a reminder @sfang97, we should run this PR from a branch of this repository, so that the EE tests can run, before we merge. I made the mistake of forgetting to do that recently and it was a pain to fix haha. |
@armsnyder should be good now. Let me know if I forget something. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm! If you don't squash usually we will do it for you when we merge.
@roidelapluie What's your typical workflow for running EE tests? (Also see my earlier question about start-gitlab.sh
)
@ahmet2mir looks like one conflicting file and then we can get this merged. |
@nicholasklick merged master to this branch |
b40f672
to
c948e81
Compare
* template_name * template_project_id * use_custom_template * group_with_project_templates_id
c948e81
to
0e0a69e
Compare
@armsnyder @sfang97 @roidelapluie I remerged and pushed forced changes due to lot of conflicts with master. Could we merge this or need I rebase everyday :) |
Hello,
I re-use the same test than
initializereadme
(no state).use_custom_template
,template_project_id
andgroup_with_project_templates_id
are EE featurestemplate_name
is EE and CE feature.I see that Gitlab will took probably this repo control #376 so they probably rework all tests to split EE and CE.
We could use
tags
withgo test
but i'm not confortable with that and we have to change everywhereSo to simplify EE tests, I added an environment variableGITLAB_EE
, when we enter in this test, it's skipped when not EE(use
SkipFunc: isRunningInCE
)on CE
In other hand, in
start-gitlab
, via rails, I:Thoses lines works with CE too (so I don't remove them, if in future Gitlab move thoses EE features to CE, we just have to remove the
GITLAB_EESkipFunc in tests)And also migrate to go gitlab 0.37.0