Branch: refs/heads/add-integration-testing-with-docker
  Home:   https://github.com/jenkinsci/swarm-plugin
  Commit: 803bd56538758ec88847ef5cb79017d2211e1ec3
      
https://github.com/jenkinsci/swarm-plugin/commit/803bd56538758ec88847ef5cb79017d2211e1ec3
  Author: Peter Jönsson <[email protected]>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    A Dockerfile
    A docker-compose.yml
    A jenkins/Dockerfile

  Log Message:
  -----------
  Add Docker for integration testing

As the swarm client is always used together with Jenkins we need to
make sure these two pieces of infrastructure works together. Setup a
bare minimal environment using Docker.


  Commit: 7f18c75e5040237b948b3ef2a527d970ff86fe4d
      
https://github.com/jenkinsci/swarm-plugin/commit/7f18c75e5040237b948b3ef2a527d970ff86fe4d
  Author: Peter Jönsson <[email protected]>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M client/src/main/java/hudson/plugins/swarm/Client.java
    M client/src/main/java/hudson/plugins/swarm/SwarmClient.java
    M jenkins/Dockerfile
    M plugin/src/main/java/hudson/plugins/swarm/PluginImpl.java
    M plugin/src/main/java/hudson/plugins/swarm/SwarmSlave.java

  Log Message:
  -----------
  Make IntelliJ happy


  Commit: 578756427f9730e40e191fe3032d41d7d2c1f640
      
https://github.com/jenkinsci/swarm-plugin/commit/578756427f9730e40e191fe3032d41d7d2c1f640
  Author: Peter Jönsson <[email protected]>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M Dockerfile
    M client/src/main/java/hudson/plugins/swarm/Client.java
    M client/src/main/java/hudson/plugins/swarm/SwarmClient.java
    M jenkins/Dockerfile
    A upload-swarm-plugin.sh

  Log Message:
  -----------
  Correct Dockerfiles to actually work

Make sure when we run docker-compose up that we actually get the
containers in a state that they are ready to be interconnected.

Right now one needs to run the bash script to upload the newly built
swarm plugin.

TODO: Add a simple jenkins job that executes on the swarm connected
agent so we are 100% sure it will work properly.


  Commit: 1a9095d9aac71593750ab6a32cf84ec3630c0eae
      
https://github.com/jenkinsci/swarm-plugin/commit/1a9095d9aac71593750ab6a32cf84ec3630c0eae
  Author: Peter Jönsson <[email protected]>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M plugin/src/main/java/hudson/plugins/swarm/PluginImpl.java
    M plugin/src/main/java/hudson/plugins/swarm/UDPFragmentImpl.java
    M pom.xml

  Log Message:
  -----------
  Correct rebase mess up

Make sure we build properly again. Also fix indentation of the pom.xml
file.


Compare: 
https://github.com/jenkinsci/swarm-plugin/compare/375f2a99a5be...1a9095d9aac7

-- 
You received this message because you are subscribed to the Google Groups 
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to