Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix: Error when upgrading old job config with tuleap-git-branch-source 3.2.0 #303

Merged
merged 1 commit into from
Oct 15, 2021
Merged

Fix: Error when upgrading old job config with tuleap-git-branch-source 3.2.0 #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/main/java/org/jenkinsci/plugins/tuleap_git_branch_source/TuleapSCMNavigator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@

import javax.inject.Inject;
import java.io.IOException;
import java.io.ObjectStreamException;
import java.util.*;
import java.util.logging.Logger;
import java.util.stream.Collectors;
Expand All @@ -55,6 +56,7 @@ public class TuleapSCMNavigator extends SCMNavigator {
private static final String TULEAP_FORK_PARTIAL_PATH = "/u/";

private String tuleapProjectId;
private String projectId;
private List<SCMTrait<? extends SCMTrait<?>>> traits;
private String credentialsId;
private String apiUri, gitBaseUri;
Expand All @@ -66,6 +68,15 @@ public TuleapSCMNavigator(String tuleapProjectId) {
this.tuleapProjectId = tuleapProjectId;
}

private Object readResolve() throws ObjectStreamException {
if (! (this.projectId == null)) {
this.tuleapProjectId = this.projectId;
this.projectId = null;
}

return this;
}

@NonNull
@Override
protected String id() {
Expand Down
33 changes: 33 additions & 0 deletions ...org/jenkinsci/plugins/tuleap_git_branch_source/TuleapSCMNavigatorDeserializationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package org.jenkinsci.plugins.tuleap_git_branch_source;

import jenkins.branch.OrganizationFolder;
import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.JenkinsRule;
import org.jvnet.hudson.test.recipes.LocalData;

import static org.junit.Assert.assertEquals;

public class TuleapSCMNavigatorDeserializationTest {

@Rule
public JenkinsRule jenkins = new JenkinsRule();

@Test
@LocalData
public void deserializationOfNewTuleapProjectIdAttributeWorks() {
OrganizationFolder folder = (OrganizationFolder) jenkins.getInstance().getItemByFullName("step");
TuleapSCMNavigator navigator = folder.getNavigators().get(TuleapSCMNavigator.class);

assertEquals(navigator.getTuleapProjectId(), "101");
}

@Test
@LocalData
public void deserializationOfOldProjectIdAttributeWorks() {
OrganizationFolder folder = (OrganizationFolder) jenkins.getInstance().getItemByFullName("step");
TuleapSCMNavigator navigator = folder.getNavigators().get(TuleapSCMNavigator.class);

assertEquals(navigator.getTuleapProjectId(), "101");
}
}
38 changes: 38 additions & 0 deletions ...NavigatorDeserializationTest/deserializationOfNewTuleapProjectIdAttributeWorks/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version='1.1' encoding='UTF-8'?>
<hudson>
<disabledAdministrativeMonitors/>
<version>2.249.3</version>
<installStateName>DEVELOPMENT</installStateName>
<numExecutors>2</numExecutors>
<mode>NORMAL</mode>
<useSecurity>true</useSecurity>
<authorizationStrategy class="hudson.security.AuthorizationStrategy$Unsecured"/>
<securityRealm class="hudson.security.SecurityRealm$None"/>
<disableRememberMe>false</disableRememberMe>
<projectNamingStrategy class="jenkins.model.ProjectNamingStrategy$DefaultProjectNamingStrategy"/>
<workspaceDir>${JENKINS_HOME}/workspace/${ITEM_FULL_NAME}</workspaceDir>
<buildsDir>${ITEM_ROOTDIR}/builds</buildsDir>
<jdks/>
<viewsTabBar class="hudson.views.DefaultViewsTabBar"/>
<myViewsTabBar class="hudson.views.DefaultMyViewsTabBar"/>
<clouds/>
<quietPeriod>5</quietPeriod>
<scmCheckoutRetryCount>0</scmCheckoutRetryCount>
<views>
<hudson.model.AllView>
<owner class="hudson" reference="../../.."/>
<name>all</name>
<filterExecutors>false</filterExecutors>
<filterQueue>false</filterQueue>
<properties class="hudson.model.View$PropertyList"/>
</hudson.model.AllView>
</views>
<primaryView>all</primaryView>
<slaveAgentPort>0</slaveAgentPort>
<label></label>
<crumbIssuer class="hudson.security.csrf.DefaultCrumbIssuer">
<excludeClientIPFromCrumb>false</excludeClientIPFromCrumb>
</crumbIssuer>
<nodeProperties/>
<globalNodeProperties/>
</hudson>
94 changes: 94 additions & 0 deletions ...eserializationTest/deserializationOfNewTuleapProjectIdAttributeWorks/jobs/step/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
<?xml version='1.1' encoding='UTF-8'?>
<jenkins.branch.OrganizationFolder plugin="branch-api@2.6.2">
<actions/>
<description></description>
<properties>
<jenkins.branch.OrganizationChildHealthMetricsProperty>
<templates>
<com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric plugin="cloudbees-folder@6.16">
<nonRecursive>false</nonRecursive>
</com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
</templates>
</jenkins.branch.OrganizationChildHealthMetricsProperty>
<jenkins.branch.OrganizationChildOrphanedItemsProperty>
<strategy class="jenkins.branch.OrganizationChildOrphanedItemsProperty$Inherit"/>
</jenkins.branch.OrganizationChildOrphanedItemsProperty>
<jenkins.branch.OrganizationChildTriggersProperty>
<templates>
<com.cloudbees.hudson.plugins.folder.computed.PeriodicFolderTrigger plugin="cloudbees-folder@6.16">
<spec>H H/4 * * *</spec>
<interval>86400000</interval>
</com.cloudbees.hudson.plugins.folder.computed.PeriodicFolderTrigger>
</templates>
</jenkins.branch.OrganizationChildTriggersProperty>
<com.cloudbees.hudson.plugins.folder.properties.FolderCredentialsProvider_-FolderCredentialsProperty plugin="cloudbees-folder@6.16">
<domainCredentialsMap class="hudson.util.CopyOnWriteMap$Hash">
<entry>
<com.cloudbees.plugins.credentials.domains.Domain plugin="credentials@2.6.1">
<specifications/>
</com.cloudbees.plugins.credentials.domains.Domain>
<java.util.concurrent.CopyOnWriteArrayList>
<io.jenkins.plugins.tuleap__credentials.TuleapAccessTokenImpl plugin="tuleap-api@2.4.2">
<id>627eca5f-a6b1-4383-8e08-4674b52981ea</id>
<description></description>
<token>{AQAAABAAAABQWF+9ckmrFkPty2t6PI4EhGW/udzBu2KZv6Uzjd8B0hO79lIQfm2S2fVEAchMiHpE+Tj2ifLNKYDUb4SffOvRzolVymza5SbCDN2436a/c6DPzhjrsHsCSbqVV8vrh7Qm}</token>
</io.jenkins.plugins.tuleap__credentials.TuleapAccessTokenImpl>
</java.util.concurrent.CopyOnWriteArrayList>
</entry>
</domainCredentialsMap>
</com.cloudbees.hudson.plugins.folder.properties.FolderCredentialsProvider_-FolderCredentialsProperty>
<jenkins.branch.NoTriggerOrganizationFolderProperty>
<branches>.*</branches>
</jenkins.branch.NoTriggerOrganizationFolderProperty>
</properties>
<folderViews class="jenkins.branch.OrganizationFolderViewHolder">
<owner reference="../.."/>
</folderViews>
<healthMetrics/>
<icon class="jenkins.branch.MetadataActionFolderIcon">
<owner class="jenkins.branch.OrganizationFolder" reference="../.."/>
</icon>
<orphanedItemStrategy class="com.cloudbees.hudson.plugins.folder.computed.DefaultOrphanedItemStrategy" plugin="cloudbees-folder@6.16">
<pruneDeadBranches>true</pruneDeadBranches>
<daysToKeep>-1</daysToKeep>
<numToKeep>-1</numToKeep>
</orphanedItemStrategy>
<triggers>
<com.cloudbees.hudson.plugins.folder.computed.PeriodicFolderTrigger plugin="cloudbees-folder@6.16">
<spec>H H/4 * * *</spec>
<interval>86400000</interval>
</com.cloudbees.hudson.plugins.folder.computed.PeriodicFolderTrigger>
</triggers>
<disabled>false</disabled>
<navigators>
<org.jenkinsci.plugins.tuleap__git__branch__source.TuleapSCMNavigator plugin="tuleap-git-branch-source@3.2.1-SNAPSHOT">
<tuleapProjectId>101</tuleapProjectId>
<traits>
<jenkins.scm.impl.trait.WildcardSCMSourceFilterTrait plugin="scm-api@2.6.5">
<includes>*</includes>
<excludes></excludes>
</jenkins.scm.impl.trait.WildcardSCMSourceFilterTrait>
<org.jenkinsci.plugins.tuleap__git__branch__source.trait.TuleapBranchDiscoveryTrait/>
<org.jenkinsci.plugins.tuleap__git__branch__source.trait.TuleapOriginPullRequestDiscoveryTrait/>
<jenkins.plugins.git.traits.RefSpecsSCMSourceTrait plugin="git@4.6.0">
<templates>
<jenkins.plugins.git.traits.RefSpecsSCMSourceTrait_-RefSpecTemplate>
<value></value>
</jenkins.plugins.git.traits.RefSpecsSCMSourceTrait_-RefSpecTemplate>
</templates>
</jenkins.plugins.git.traits.RefSpecsSCMSourceTrait>
</traits>
<credentialsId>627eca5f-a6b1-4383-8e08-4674b52981ea</credentialsId>
<repositories/>
</org.jenkinsci.plugins.tuleap__git__branch__source.TuleapSCMNavigator>
</navigators>
<projectFactories>
<org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProjectFactory plugin="workflow-multibranch@2.24">
<scriptPath>Jenkinsfile</scriptPath>
</org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProjectFactory>
</projectFactories>
<buildStrategies/>
<strategy class="jenkins.branch.DefaultBranchPropertyStrategy">
<properties class="empty-list"/>
</strategy>
</jenkins.branch.OrganizationFolder>
38 changes: 38 additions & 0 deletions ...eapSCMNavigatorDeserializationTest/deserializationOfOldProjectIdAttributeWorks/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version='1.1' encoding='UTF-8'?>
<hudson>
<disabledAdministrativeMonitors/>
<version>2.249.3</version>
<installStateName>DEVELOPMENT</installStateName>
<numExecutors>2</numExecutors>
<mode>NORMAL</mode>
<useSecurity>true</useSecurity>
<authorizationStrategy class="hudson.security.AuthorizationStrategy$Unsecured"/>
<securityRealm class="hudson.security.SecurityRealm$None"/>
<disableRememberMe>false</disableRememberMe>
<projectNamingStrategy class="jenkins.model.ProjectNamingStrategy$DefaultProjectNamingStrategy"/>
<workspaceDir>${JENKINS_HOME}/workspace/${ITEM_FULL_NAME}</workspaceDir>
<buildsDir>${ITEM_ROOTDIR}/builds</buildsDir>
<jdks/>
<viewsTabBar class="hudson.views.DefaultViewsTabBar"/>
<myViewsTabBar class="hudson.views.DefaultMyViewsTabBar"/>
<clouds/>
<quietPeriod>5</quietPeriod>
<scmCheckoutRetryCount>0</scmCheckoutRetryCount>
<views>
<hudson.model.AllView>
<owner class="hudson" reference="../../.."/>
<name>all</name>
<filterExecutors>false</filterExecutors>
<filterQueue>false</filterQueue>
<properties class="hudson.model.View$PropertyList"/>
</hudson.model.AllView>
</views>
<primaryView>all</primaryView>
<slaveAgentPort>0</slaveAgentPort>
<label></label>
<crumbIssuer class="hudson.security.csrf.DefaultCrumbIssuer">
<excludeClientIPFromCrumb>false</excludeClientIPFromCrumb>
</crumbIssuer>
<nodeProperties/>
<globalNodeProperties/>
</hudson>
94 changes: 94 additions & 0 deletions ...gatorDeserializationTest/deserializationOfOldProjectIdAttributeWorks/jobs/step/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
<?xml version='1.1' encoding='UTF-8'?>
<jenkins.branch.OrganizationFolder plugin="branch-api@2.6.2">
<actions/>
<description></description>
<properties>
<jenkins.branch.OrganizationChildHealthMetricsProperty>
<templates>
<com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric plugin="cloudbees-folder@6.16">
<nonRecursive>false</nonRecursive>
</com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
</templates>
</jenkins.branch.OrganizationChildHealthMetricsProperty>
<jenkins.branch.OrganizationChildOrphanedItemsProperty>
<strategy class="jenkins.branch.OrganizationChildOrphanedItemsProperty$Inherit"/>
</jenkins.branch.OrganizationChildOrphanedItemsProperty>
<jenkins.branch.OrganizationChildTriggersProperty>
<templates>
<com.cloudbees.hudson.plugins.folder.computed.PeriodicFolderTrigger plugin="cloudbees-folder@6.16">
<spec>H H/4 * * *</spec>
<interval>86400000</interval>
</com.cloudbees.hudson.plugins.folder.computed.PeriodicFolderTrigger>
</templates>
</jenkins.branch.OrganizationChildTriggersProperty>
<com.cloudbees.hudson.plugins.folder.properties.FolderCredentialsProvider_-FolderCredentialsProperty plugin="cloudbees-folder@6.16">
<domainCredentialsMap class="hudson.util.CopyOnWriteMap$Hash">
<entry>
<com.cloudbees.plugins.credentials.domains.Domain plugin="credentials@2.6.1">
<specifications/>
</com.cloudbees.plugins.credentials.domains.Domain>
<java.util.concurrent.CopyOnWriteArrayList>
<io.jenkins.plugins.tuleap__credentials.TuleapAccessTokenImpl plugin="tuleap-api@2.4.2">
<id>627eca5f-a6b1-4383-8e08-4674b52981ea</id>
<description></description>
<token>{AQAAABAAAABQWF+9ckmrFkPty2t6PI4EhGW/udzBu2KZv6Uzjd8B0hO79lIQfm2S2fVEAchMiHpE+Tj2ifLNKYDUb4SffOvRzolVymza5SbCDN2436a/c6DPzhjrsHsCSbqVV8vrh7Qm}</token>
</io.jenkins.plugins.tuleap__credentials.TuleapAccessTokenImpl>
</java.util.concurrent.CopyOnWriteArrayList>
</entry>
</domainCredentialsMap>
</com.cloudbees.hudson.plugins.folder.properties.FolderCredentialsProvider_-FolderCredentialsProperty>
<jenkins.branch.NoTriggerOrganizationFolderProperty>
<branches>.*</branches>
</jenkins.branch.NoTriggerOrganizationFolderProperty>
</properties>
<folderViews class="jenkins.branch.OrganizationFolderViewHolder">
<owner reference="../.."/>
</folderViews>
<healthMetrics/>
<icon class="jenkins.branch.MetadataActionFolderIcon">
<owner class="jenkins.branch.OrganizationFolder" reference="../.."/>
</icon>
<orphanedItemStrategy class="com.cloudbees.hudson.plugins.folder.computed.DefaultOrphanedItemStrategy" plugin="cloudbees-folder@6.16">
<pruneDeadBranches>true</pruneDeadBranches>
<daysToKeep>-1</daysToKeep>
<numToKeep>-1</numToKeep>
</orphanedItemStrategy>
<triggers>
<com.cloudbees.hudson.plugins.folder.computed.PeriodicFolderTrigger plugin="cloudbees-folder@6.16">
<spec>H H/4 * * *</spec>
<interval>86400000</interval>
</com.cloudbees.hudson.plugins.folder.computed.PeriodicFolderTrigger>
</triggers>
<disabled>false</disabled>
<navigators>
<org.jenkinsci.plugins.tuleap__git__branch__source.TuleapSCMNavigator plugin="tuleap-git-branch-source@3.2.1-SNAPSHOT">
<projectId>101</projectId>
<traits>
<jenkins.scm.impl.trait.WildcardSCMSourceFilterTrait plugin="scm-api@2.6.5">
<includes>*</includes>
<excludes></excludes>
</jenkins.scm.impl.trait.WildcardSCMSourceFilterTrait>
<org.jenkinsci.plugins.tuleap__git__branch__source.trait.TuleapBranchDiscoveryTrait/>
<org.jenkinsci.plugins.tuleap__git__branch__source.trait.TuleapOriginPullRequestDiscoveryTrait/>
<jenkins.plugins.git.traits.RefSpecsSCMSourceTrait plugin="git@4.6.0">
<templates>
<jenkins.plugins.git.traits.RefSpecsSCMSourceTrait_-RefSpecTemplate>
<value></value>
</jenkins.plugins.git.traits.RefSpecsSCMSourceTrait_-RefSpecTemplate>
</templates>
</jenkins.plugins.git.traits.RefSpecsSCMSourceTrait>
</traits>
<credentialsId>627eca5f-a6b1-4383-8e08-4674b52981ea</credentialsId>
<repositories/>
</org.jenkinsci.plugins.tuleap__git__branch__source.TuleapSCMNavigator>
</navigators>
<projectFactories>
<org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProjectFactory plugin="workflow-multibranch@2.24">
<scriptPath>Jenkinsfile</scriptPath>
</org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProjectFactory>
</projectFactories>
<buildStrategies/>
<strategy class="jenkins.branch.DefaultBranchPropertyStrategy">
<properties class="empty-list"/>
</strategy>
</jenkins.branch.OrganizationFolder>