Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 552126

Summary: Disable or remove CI control block/widget for cluster-based (Jiro) JIPPs
Product: Community Reporter: Frederic Gurr <frederic.gurr>
Component: Accounts.eclipse.orgAssignee: Eric Poirier <eric.poirier>
Status: CLOSED FIXED QA Contact:
Severity: normal    
Priority: P3 CC: chris.guindon, webmaster
Version: unspecified   
Target Milestone: ---   
Hardware: PC   
OS: Linux   
Whiteboard:

Description Frederic Gurr CLA 2019-10-15 14:15:40 EDT
JIPP instances on Jiro can not be controlled by the CI control block/widget on a committer's account page. Therefore the block should either be removed completely for Jiro/Openshift based instances or it should be changed to only provide a link to JIPP instances ("Control" in the title needs to be removed as well then to avoid confusion).

It should be filtered by the ServerHost field ($Hipp->getServerHost()), which is "openshift" for Jiro JIPPs.

I assume this need to be changed here: /site_login/site_login_hipp/site_login_hipp.module

Since my Drupal skills are non-existent and I can't test locally, I'm sure the webdev team can fix this much faster.
Comment 1 Christopher Guindon CLA 2019-10-15 15:06:11 EDT
If I understand correctly, if $Hipp->getServerHost() === "openshift" then don't include links to start,stop or restart the instance?

Is there anything else that we should add for these instances?
Comment 2 Frederic Gurr CLA 2019-10-16 12:23:46 EDT
(In reply to Christopher Guindon from comment #1)
> Is there anything else that we should add for these instances?
As mentioned, "CI Control" in the title should be removed. Maybe the title should just be "CI instance".
Comment 3 Eric Poirier CLA 2019-10-31 10:16:42 EDT
Hi Fred,

This is now live on the production website.

Please reopen this bug if there's an issue with this update.

Thanks.
Comment 4 Frederic Gurr CLA 2019-10-31 11:08:18 EDT
Thanks Eric.

Unfortunately we have to do some more changes.

* The link to the CI instance (on my account the CBI instance) is wrong. It points to "https://ci./cbi" instead of "https://ci.eclipse.org/cbi". So we need something along the lines of

if $Hipp->getServerHost() === "openshift" {
  $ci_url = "https://ci.eclipse.org/" . $Project->getProjectShortName();
}

* "No CI instance found for this project. Request one." is shown (line 156). This should not be shown when $Hipp->getServerHost() === "openshift".
Comment 5 Eric Poirier CLA 2019-10-31 12:58:33 EDT
(In reply to Frederic Gurr from comment #4)
> Thanks Eric.
> 
> Unfortunately we have to do some more changes.
> 
> * The link to the CI instance (on my account the CBI instance) is wrong. It
> points to "https://ci./cbi" instead of "https://ci.eclipse.org/cbi". So we
> need something along the lines of
> 
> if $Hipp->getServerHost() === "openshift" {
>   $ci_url = "https://ci.eclipse.org/" . $Project->getProjectShortName();
> }
> 
> * "No CI instance found for this project. Request one." is shown (line 156).
> This should not be shown when $Hipp->getServerHost() === "openshift".

I created the following patch to fix the url as well.

https://foundation.eclipse.org/r/c/drupal/custom/common/site_login/+/3621

Let me know (In reply to Frederic Gurr from comment #4)
> Thanks Eric.
> 
> Unfortunately we have to do some more changes.
> 
> * The link to the CI instance (on my account the CBI instance) is wrong. It
> points to "https://ci./cbi" instead of "https://ci.eclipse.org/cbi". So we
> need something along the lines of
> 
> if $Hipp->getServerHost() === "openshift" {
>   $ci_url = "https://ci.eclipse.org/" . $Project->getProjectShortName();
> }
> 
> * "No CI instance found for this project. Request one." is shown (line 156).
> This should not be shown when $Hipp->getServerHost() === "openshift".

I created the following patch to make the requested updates.

https://foundation.eclipse.org/r/c/drupal/custom/common/site_login/+/3621
Comment 6 Frederic Gurr CLA 2019-10-31 13:06:43 EDT
Thanks. I've commented on Gerrit.
Comment 7 Eric Poirier CLA 2019-11-06 07:39:13 EST
Hi Fred,

I updated accounts.eclipse.org on production with my latest patch.

The unwanted text is now not appearing for Openshift.

Let me know if there's anything else.

Thanks.
Comment 8 Frederic Gurr CLA 2019-11-06 07:48:12 EST
LGTM! Thanks Eric.