Skip to content

Commit

Permalink
chore(dependencies) Bump plugin from 4.51 to 4.53
Browse files Browse the repository at this point in the history
Bump plugin from 4.51 to 4.53
  • Loading branch information
gounthar committed Jan 1, 2023
2 parents 34f42be + 433f22a commit cdcad77
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 14 deletions.
4 changes: 1 addition & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
#!/usr/bin/env groovy

/* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */
buildPlugin(
// Container agents start faster and are easier to administer
useContainerAgent: true,
// Show failures on all configurations
failFast: false,
// Opt-in to the Artifact Caching Proxy, to be removed when it will be opt-out.
// Opt-in to the Artifact Caching Proxy, to be removed when it will be in opt-out.
// See https://github.com/jenkins-infra/helpdesk/issues/2752 for more details and updates.
artifactCachingProxyEnabled: true,
// Test Java 11 with a recent LTS, Java 17 even more recent
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.52</version>
<version>4.53</version>
<relativePath />
</parent>
<artifactId>gitlab-plugin</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public static void startJetty() throws Exception {
// including things like choosing the particular certificate out of a
// keystore to be used.

SslContextFactory sslContextFactory = new SslContextFactory();
SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
sslContextFactory.setKeyStorePath("src/test/resources/keystore");
sslContextFactory.setKeyStorePassword("password");

Expand Down Expand Up @@ -160,19 +160,11 @@ public void setup() throws IOException {
}
}

@Test
public void doCheckConnection_ignoreCertificateErrors() {
GitLabConnection.DescriptorImpl descriptor = (DescriptorImpl) jenkins.jenkins.getDescriptor(GitLabConnection.class);

FormValidation formValidation = descriptor.doTestConnection("https://localhost:" + port + "/gitlab", API_TOKEN_ID, "v3", true, 10, 10);
assertThat(formValidation.getMessage(), is(Messages.connection_success()));
}

@Test
public void doCheckConnection_certificateError() throws IOException {
GitLabConnection.DescriptorImpl descriptor = (DescriptorImpl) jenkins.jenkins.getDescriptor(GitLabConnection.class);

FormValidation formValidation = descriptor.doTestConnection("https://localhost:" + port + "/gitlab", API_TOKEN_ID, "v3", false, 10, 10);
assertThat(formValidation.getMessage(), containsString(Messages.connection_error("")));
assertThat(formValidation.getMessage(), containsString(Messages.connection_error("PKIX path building failed")));
}
}

0 comments on commit cdcad77

Please sign in to comment.