fix the broken test case

jenkinsci · Dec 4, 2018 · 7177160 · 7177160
1 parent 53f06a5
commit 7177160
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/test/java/io/alauda/jenkins/devops/sync/util/DevOpsInit.java b/src/test/java/io/alauda/jenkins/devops/sync/util/DevOpsInit.java
@@ -65,7 +65,8 @@ public void deletePipelineConfig(AlaudaDevOpsClient client, String name) {
     public void addCronTrigger4PipelineConfig(AlaudaDevOpsClient client, String name, String cron) {
         client.pipelineConfigs().inNamespace(namespace)
                 .withName(name).edit()
-                .editOrNewSpec().addNewTrigger().withType("cron").withNewCron(true, cron)
+                .editOrNewSpec().addNewTrigger().withType("cron").withNewCron()
+                .withEnabled(true).withRule(cron).endCron()
                 .endTrigger().endSpec().done();
     }
 
@@ -99,7 +100,7 @@ public PipelineConfig createPipelineConfig(AlaudaDevOpsClient client, String scr
 
         if(cron != null) {
             PipelineTrigger trigger = new PipelineTriggerBuilder()
-                    .withType("cron").withNewCron(true, cron).build();
+                    .withType("cron").withNewCron().withEnabled(true).withRule(cron).endCron().build();
             specBuilder.withTriggers(trigger);
         }
 

diff --git a/src/test/java/io/alauda/jenkins/devops/sync/util/JenkinsUtilsTest.java b/src/test/java/io/alauda/jenkins/devops/sync/util/JenkinsUtilsTest.java
@@ -218,9 +218,9 @@ public void setJobTriggers() throws IOException, ANTLRException {
 
         // with correct cron and scm triggers
         triggers.add(new PipelineTrigger(null,
-                new PipelineTriggerCron(true, "* * * * *"), PIPELINE_TRIGGER_TYPE_CRON));
+                new PipelineTriggerCron(true, "* * * * *", null), PIPELINE_TRIGGER_TYPE_CRON));
         triggers.add(new PipelineTrigger(null,
-                new PipelineTriggerCron(false, "* * * * *"), PIPELINE_TRIGGER_TYPE_CRON));
+                new PipelineTriggerCron(false, "* * * * *", null), PIPELINE_TRIGGER_TYPE_CRON));
         triggers.add(new PipelineTrigger(new PipelineTriggerCodeChange(true, "* * * * *"),
                 null, PIPELINE_TRIGGER_TYPE_CODE_CHANGE));
         triggers.add(new PipelineTrigger(new PipelineTriggerCodeChange(false, "* * * * *"),
@@ -232,11 +232,11 @@ public void setJobTriggers() throws IOException, ANTLRException {
 
         // with invalid cron
         triggers.add(new PipelineTrigger(null,
-                new PipelineTriggerCron(true, "abc"), PIPELINE_TRIGGER_TYPE_CRON));
+                new PipelineTriggerCron(true, "abc", null), PIPELINE_TRIGGER_TYPE_CRON));
         triggers.add(new PipelineTrigger(new PipelineTriggerCodeChange(true, "abc"),
                 null, PIPELINE_TRIGGER_TYPE_CODE_CHANGE));
         triggers.add(new PipelineTrigger(null,
-                new PipelineTriggerCron(true, "abc"), "fake"));
+                new PipelineTriggerCron(true, "abc", null), "fake"));
         exs = JenkinsUtils.setJobTriggers(wfJob, triggers);
         assertEquals(2, exs.size());
     }