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.

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

Upgrade docker-fixtures from 1.11 to 1.12 #814

Merged
merged 3 commits into from
Jul 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
Expand Down Expand Up @@ -400,7 +400,7 @@
<dependency>
<groupId>org.jenkins-ci.test</groupId>
<artifactId>docker-fixtures</artifactId>
<version>1.11</version>
<version>1.12</version>
</dependency>
<dependency>
<groupId>com.github.olivergondza.dumpling</groupId>
Expand Down Expand Up @@ -462,7 +462,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.7</version>
<version>2.11.0</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM jenkins/java:d93654cc6239
# curl -s https://raw.githubusercontent.com/jenkinsci/docker-fixtures/master/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaContainer/Dockerfile | sha1sum | cut -c 1-12
Copy link
Member

Choose a reason for hiding this comment

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

Use a permalink (like a tag name).

Copy link
Member Author

Choose a reason for hiding this comment

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

Request without reasoning

FROM jenkins/java:387404da3ce7

RUN cd /tmp && \
wget -nv -O - https://get.docker.com/builds/Linux/x86_64/docker-1.13.1.tgz | tar xvfz - docker/docker && \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
FROM jenkins/java:d93654cc6239
# curl -s https://raw.githubusercontent.com/jenkinsci/docker-fixtures/master/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaContainer/Dockerfile | sha1sum | cut -c 1-12
FROM jenkins/java:387404da3ce7
COPY *.pub /tmp
RUN cat /tmp/*.pub >> /home/test/.ssh/authorized_keys
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM jenkins/java:d93654cc6239
# curl -s https://raw.githubusercontent.com/jenkinsci/docker-fixtures/master/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaContainer/Dockerfile | sha1sum | cut -c 1-12
FROM jenkins/java:387404da3ce7
RUN apt-get update && apt-get install -y vnc4server imagemagick

# So it is owned by root and has the permissions vncserver seems to require:
Expand Down
5 changes: 3 additions & 2 deletions src/test/java/core/FormValidationTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,12 @@
*/
package core;

import hudson.util.VersionNumber;
import org.jenkinsci.test.acceptance.junit.AbstractJUnitTest;
import org.jenkinsci.test.acceptance.po.FormValidation;
import org.jenkinsci.test.acceptance.po.JenkinsConfig;
import org.jenkinsci.test.acceptance.po.ListView;
import org.junit.Test;
import org.openqa.selenium.Alert;
import org.openqa.selenium.Keys;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
Expand Down Expand Up @@ -64,6 +63,8 @@ private void jsValidation() {
assertThat(formValidation, silent());

c.numExecutors.set(-16);
c.numExecutors.resolve().sendKeys(Keys.TAB);
c.numExecutors.sleep(100L);
formValidation = c.numExecutors.getFormValidation();

String errorMessage = "Not a non-negative integer";
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/plugins/SshSlavesPluginTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -211,15 +211,15 @@ private void verifyUnexpectedValueForCredential(String message, CredentialsPage
setUp();
SshSlaveLauncher launcher = configureDefaultSSHSlaveLauncher().pwdCredentials("test", "test");

String javaPath = "/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java";
String javaPath = "/usr/lib/jvm/java-11-openjdk-amd64/bin/java";
if (System.getProperty("os.arch").equals("aarch64")) {
javaPath = "/usr/lib/jvm/java-8-openjdk-arm64/jre/bin/java";
javaPath = "/usr/lib/jvm/java-11-openjdk-arm64/bin/java";
}
launcher.javaPath.set(javaPath);
slave.save();

verify();
verifyLog("java-8-openjdk");
verifyLog("java-11-openjdk");
}

@Test public void jvmOptions() {
Expand Down