Skip to content
This repository has been archived by the owner on Mar 17, 2021. It is now read-only.

Updating to the latest upstream '7.0.0-rc-4.0' version #1481

Merged
merged 15 commits into from
Jul 30, 2019
Merged

Updating to the latest upstream '7.0.0-rc-4.0' version #1481

merged 15 commits into from
Jul 30, 2019

Conversation

ibuziuk
Copy link
Member

@ibuziuk ibuziuk commented Jul 8, 2019 •
edited
Loading

What does this PR do?

Updating to the latest upstream '7.0.0-rc-4.0' version

What issues does this PR fix or reference?

#1489

How have you tested this PR?

PR check CI

@centos-ci
Copy link
Collaborator

@ibuziuk The che server [build 1651] has been successfully deployed.

http://rhche-prcheck-1481.devtools-dev.ext.devshift.net

@amisevsk
Copy link
Collaborator

From the check-upstream-dashboard.sh script:

Upstream changes detected. Changed files:

./assembly/fabric8-ide-dashboard-war/target/sources/src/app/workspaces/create-workspace/create-workspace.controller.ts
./assembly/fabric8-ide-dashboard-war/target/sources/src/app/workspaces/create-workspace/create-workspace.html
./assembly/fabric8-ide-dashboard-war/target/sources/src/components/widget/footer/che-footer.html

But I haven't looked into it further.

@ibuziuk
Copy link
Member Author

ibuziuk commented Jul 22, 2019

[test]

@centos-ci
Copy link
Collaborator

@ibuziuk The che server [build 1679] failed.

Link URL
console https://ci.centos.org/view/Devtools/job/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1679/console
artifacts http://artifacts.ci.centos.org/devtools/rhche/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1679/

If the build or deployment fails, the artifacts will not be present. Don't panic, just grab a towel.

@ibuziuk
Copy link
Member Author

ibuziuk commented Jul 22, 2019

Currently failing with:

[INFO] Compiling 19 source files to /root/payload/plugins/fabric8-multi-tenant-manager/target/classes
/root/payload/plugins/fabric8-multi-tenant-manager/src/main/java/com/redhat/che/multitenant/RhCheInfraEnvironmentProvisioner.java:94: error: constructor OpenShiftEnvironmentProvisioner in class OpenShiftEnvironmentProvisioner cannot be applied to given types;
super(
^
required: boolean,OpenShiftUniqueNamesProvisioner,RouteTlsProvisioner,ServersConverter,EnvVarsConverter,RestartPolicyRewriter,WorkspaceVolumesStrategy,RamLimitRequestProvisioner,InstallerServersPortProvisioner,LogsVolumeMachineProvisioner,PodTerminationGracePeriodProvisioner,ImagePullSecretProvisioner,ProxySettingsProvisioner,ServiceAccountProvisioner,CertificateProvisioner,VcsSshKeysProvisioner
found: boolean,OpenShiftUniqueNamesProvisioner,RouteTlsProvisioner,ServersConverter,EnvVarsConverter,RestartPolicyRewriter,WorkspaceVolumesStrategy,RamLimitRequestProvisioner,InstallerServersPortProvisioner,LogsVolumeMachineProvisioner,PodTerminationGracePeriodProvisioner,ImagePullSecretProvisioner,ProxySettingsProvisioner,ServiceAccountProvisioner,CertificateProvisioner
reason: actual and formal argument lists differ in length

@ibuziuk ibuziuk mentioned this pull request Jul 22, 2019
Closed
@centos-ci
Copy link
Collaborator

@ibuziuk The che server [build 1680] failed.

Link URL
console https://ci.centos.org/view/Devtools/job/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1680/console
artifacts http://artifacts.ci.centos.org/devtools/rhche/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1680/

If the build or deployment fails, the artifacts will not be present. Don't panic, just grab a towel.

@centos-ci
Copy link
Collaborator

@ibuziuk The che server [build 1681] failed.

Link URL
console https://ci.centos.org/view/Devtools/job/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1681/console
artifacts http://artifacts.ci.centos.org/devtools/rhche/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1681/

If the build or deployment fails, the artifacts will not be present. Don't panic, just grab a towel.

@amisevsk
Copy link
Collaborator

[test]

@centos-ci
Copy link
Collaborator

@ibuziuk The che server [build 1682] failed.

Link URL
console https://ci.centos.org/view/Devtools/job/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1682/console
artifacts http://artifacts.ci.centos.org/devtools/rhche/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1682/

If the build or deployment fails, the artifacts will not be present. Don't panic, just grab a towel.

@ibuziuk
Copy link
Member Author

ibuziuk commented Jul 23, 2019

[test]

@amisevsk
Copy link
Collaborator

Failing on functional tests, which isn't surprising since the dashboard has changed in rc-4.0.

@centos-ci
Copy link
Collaborator

@ibuziuk The che server [build 1685] failed.

Link URL
console https://ci.centos.org/view/Devtools/job/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1685/console
artifacts http://artifacts.ci.centos.org/devtools/rhche/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1685/

If the build or deployment fails, the artifacts will not be present. Don't panic, just grab a towel.

@ibuziuk
Copy link
Member Author

ibuziuk commented Jul 23, 2019

@ScrewTSW @Katka92 could you please investigate the test failures - https://ci.centos.org/job/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1685/console

@ibuziuk ibuziuk marked this pull request as ready for review July 26, 2019 11:18
@ibuziuk
Copy link
Member Author

ibuziuk commented Jul 26, 2019

PR is ready for review. Once test are fixed we will be able to promote 7.0.0-rc-4.0 to prod-preview

@centos-ci
Copy link
Collaborator

@ibuziuk The che server [build 1698] failed.

Link URL
console https://ci.centos.org/view/Devtools/job/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1698/console
artifacts http://artifacts.ci.centos.org/devtools/rhche/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1698/

If the build or deployment fails, the artifacts will not be present. Don't panic, just grab a towel.

@ibuziuk
Copy link
Member Author

ibuziuk commented Jul 26, 2019

[test]

@centos-ci
Copy link
Collaborator

@ibuziuk The che server [build 1701] failed.

Link URL
console https://ci.centos.org/view/Devtools/job/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1701/console
artifacts http://artifacts.ci.centos.org/devtools/rhche/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1701/

If the build or deployment fails, the artifacts will not be present. Don't panic, just grab a towel.

@ibuziuk
Copy link
Member Author

ibuziuk commented Jul 29, 2019

[test]

@centos-ci
Copy link
Collaborator

@ibuziuk The che server [build 1702] failed.

Link URL
console https://ci.centos.org/view/Devtools/job/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1702/console
artifacts http://artifacts.ci.centos.org/devtools/rhche/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1702/

If the build or deployment fails, the artifacts will not be present. Don't panic, just grab a towel.

@ibuziuk
Copy link
Member Author

ibuziuk commented Jul 29, 2019

Ok, looks like we need to update the build due to the initial cleanup of Che 6 legacy code - eclipse-che/che#13788

ibuziuk and others added 6 commits July 29, 2019 13:06
@ibuziuk @amisevsk
che #13788: Removing Che 6 specific code due to cleanup in the upstream
c6759fe 
Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
@ibuziuk @amisevsk
che #13788 Removing 'metadata-complete' and 'absolute-ordering' from …
4df1ce2 
…web.xml

Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
@ibuziuk @amisevsk
che #13788 Removing bayesian agent from wsmaser build
4ab2bcf 
Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
@ibuziuk @amisevsk
che #13788 Adding some modules to the 'ignoredUnusedDeclaredDependenc…
8317f35 
…ies' due to removal of the 'che-core-dynamodule-maven-plugin'

Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
@ibuziuk @amisevsk
che #1481 Removing obsolete dependencies from the 'assemby-main'
e6aa81c 
Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
@amisevsk
Remove copying samples.json in entrypoint
0864e22 
Signed-off-by: Angel Misevski <amisevsk@redhat.com>
@centos-ci
Copy link
Collaborator

@ibuziuk The che server [build 1716] failed.

Link URL
console https://ci.centos.org/view/Devtools/job/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1716/console
artifacts http://artifacts.ci.centos.org/devtools/rhche/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1716/

If the build or deployment fails, the artifacts will not be present. Don't panic, just grab a towel.

@amisevsk
Remove deprecated modules and update upstream dependencies
bce228b 
- Remove modules deprecated alongside removal of che6 legacy code
- Update fabric8-ide-assembly-ide-war to use upstream assembly-root-war

Signed-off-by: Angel Misevski <amisevsk@redhat.com>
@centos-ci
Copy link
Collaborator

@ibuziuk The che server [build 1717] failed.

Link URL
console https://ci.centos.org/view/Devtools/job/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1717/console
artifacts http://artifacts.ci.centos.org/devtools/rhche/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1717/

If the build or deployment fails, the artifacts will not be present. Don't panic, just grab a towel.

@centos-ci
Copy link
Collaborator

@ibuziuk The che server [build 1718] failed.

Link URL
console https://ci.centos.org/view/Devtools/job/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1718/console
artifacts http://artifacts.ci.centos.org/devtools/rhche/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1718/

If the build or deployment fails, the artifacts will not be present. Don't panic, just grab a towel.

@amisevsk
Restore che-plugin-analytics-wsmaster
705efec 
Restore wsmaster analytics plugin as it provides a required endpoint for
RhCheKeycloak.js

Signed-off-by: Angel Misevski <amisevsk@redhat.com>
@centos-ci
Copy link
Collaborator

@ibuziuk The che server [build 1719] failed.

Link URL
console https://ci.centos.org/view/Devtools/job/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1719/console
artifacts http://artifacts.ci.centos.org/devtools/rhche/devtools-rh-che-rh-che-prcheck-dev.rdu2c.fabric8.io/1719/

If the build or deployment fails, the artifacts will not be present. Don't panic, just grab a towel.

@amisevsk
Minor e2e test fixes to match upstream changes
5028152 
Signed-off-by: Angel Misevski <amisevsk@redhat.com>
@centos-ci
Copy link
Collaborator

@ibuziuk The che server [build 1720] has been successfully deployed.

http://rhche-prcheck-1481.devtools-dev.ext.devshift.net

@amisevsk
Copy link
Collaborator

@ScrewTSW @Katka92 PTAL at the e2e changes before we merge.

ibuziuk
ibuziuk commented Jul 30, 2019
View reviewed changes
assembly/assembly-ide-war/pom.xml
@@ -48,7 +41,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.che</groupId>
<artifactId>assembly-ide-war</artifactId>
<artifactId>assembly-root-war</artifactId>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe it makes sense to rename the folder also to assembly-root-war to make it consistent ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we could probably consider renaming as part of another PR

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm +1 on renaming, I didn't do it here to avoid messing with the build too much at once.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agree PR was already BIG, we could handle it separately

@ibuziuk ibuziuk requested a review from davidfestal July 30, 2019 09:03
@ibuziuk
rh-che #1493: Disabling 'ForwardActivityFilter' as part of the 'che-p…
78c7755 
…lugin-analytics-wsagent' deprecation

Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
@centos-ci
Copy link
Collaborator

@ibuziuk The che server [build 1722] has been successfully deployed.

http://rhche-prcheck-1481.devtools-dev.ext.devshift.net

@ibuziuk ibuziuk merged commit adf6b52 into master Jul 30, 2019
ibuziuk added a commit that referenced this pull request Jul 30, 2019
@ibuziuk
che #1481 Removing obsolete dependencies from the 'assemby-main'
ee4a7c6 
Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
@delete-merged-branch delete-merged-branch bot deleted the ibuziuk-patch-27 branch July 30, 2019 11:49
@ibuziuk ibuziuk mentioned this pull request Jul 30, 2019
Closed
This was referenced Aug 13, 2019
Closed
Closed
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@amisevsk amisevsk amisevsk approved these changes

@davidfestal davidfestal davidfestal approved these changes

@Katka92 Katka92 Katka92 approved these changes

@ScrewTSW ScrewTSW Awaiting requested review from ScrewTSW

Assignees
No one assigned
Labels
kind/task
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@ibuziuk @centos-ci @amisevsk @davidfestal @Katka92 @che-bot