Project

General

Profile

bug #6255

jenkins job cdm-webapp-HFX-FINISH fails due to merge conflict

Added by Andreas Kohlbecker about 2 years ago. Updated over 1 year ago.

Status:
Closed
Priority:
Highest
Category:
devOps
Target version:
Start date:
12/07/2016
Due date:
% Done:

0%

Severity:
normal
Found in Version:

Description

jenkins job cdm-webapp-HFX-FINISH fails due to merge conflict on merging master back to develop. The conflict occurs in the pom.xml at the project version.

Using the same strategy as in cdmlib-HFX-FINISH does not work since -DnoReleaseMerge=true is not affecting the hotfix-finish goal.

It seems we need to use the gitflow shelĺ scripts for reliable HFX releases.

History

#1 Updated by Andreas Kohlbecker about 2 years ago

  • Description updated (diff)

#2 Updated by Andreas Müller almost 2 years ago

  • Target version changed from Release 4.5 to Release 4.6

#3 Updated by Andreas Kohlbecker almost 2 years ago

  • Status changed from New to Resolved

I created a new job based on taxeditor-HFX-FINISH, the old one is preserved as cdm-webapp-HFX-FINISH (BACKUP) which is disabled and can be deleted once the new job has run successfully.

#4 Updated by Andreas Kohlbecker over 1 year ago

  • Status changed from Resolved to Closed

all done and cleaned up - closing the ticket

Also available in: Atom PDF

Add picture from clipboard (Maximum size: 40 MB)