Projects >> jclouds-plugin >>099b4adee5e63e1f60f80895d66f4306c1a89474

Chunk
Conflicting content 
import shaded.com.google.common.collect.Iterables;
import shaded.com.google.common.io.Closeables;

<<<<<<< HEAD
import com.cloudbees.plugins.credentials.common.StandardUsernameCredentials;
import com.cloudbees.plugins.credentials.common.StandardUsernamePasswordCredentials;
import com.cloudbees.plugins.credentials.common.StandardUsernameListBoxModel;
import com.cloudbees.plugins.credentials.domains.Domain;
import com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl;
import com.cloudbees.plugins.credentials.CredentialsScope;
import com.cloudbees.plugins.credentials.CredentialsMatchers;
import com.cloudbees.jenkins.plugins.sshcredentials.SSHUserPrivateKey;
import com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPrivateKey;
import org.acegisecurity.context.SecurityContext;
import hudson.security.ACL;
import com.cloudbees.plugins.credentials.CredentialsStore;
import com.cloudbees.plugins.credentials.CredentialsProvider;
import org.acegisecurity.context.SecurityContextHolder;
import hudson.security.AccessControlled;

import jenkins.plugins.jclouds.internal.SSHPublicKeyExtractor;

import hudson.util.XStream2;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
=======
import static jenkins.plugins.jclouds.compute.CloudInstanceDefaults.DEFAULT_INSTANCE_RETENTION_TIME_IN_MINUTES;
>>>>>>> e4f8cdcc8b54c897e626a5aa3f0b179d42b52d93

/**
 * The JClouds version of the Jenkins Cloud.
Solution content 
import shaded.com.google.common.collect.Iterables;
import shaded.com.google.common.io.Closeables;

import com.cloudbees.plugins.credentials.common.StandardUsernameCredentials;
import com.cloudbees.plugins.credentials.common.StandardUsernamePasswordCredentials;
import com.cloudbees.plugins.credentials.common.StandardUsernameListBoxModel;
import com.cloudbees.plugins.credentials.domains.Domain;
import com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl;
import com.cloudbees.plugins.credentials.CredentialsScope;
import com.cloudbees.plugins.credentials.CredentialsMatchers;
import com.cloudbees.jenkins.plugins.sshcredentials.SSHUserPrivateKey;
import com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPrivateKey;
import org.acegisecurity.context.SecurityContext;
import hudson.security.ACL;
import com.cloudbees.plugins.credentials.CredentialsStore;
import com.cloudbees.plugins.credentials.CredentialsProvider;
import org.acegisecurity.context.SecurityContextHolder;
import hudson.security.AccessControlled;

import jenkins.plugins.jclouds.internal.SSHPublicKeyExtractor;

import hudson.util.XStream2;
import com.thoughtworks.xstream.converters.UnmarshallingContext;

import static jenkins.plugins.jclouds.compute.CloudInstanceDefaults.DEFAULT_INSTANCE_RETENTION_TIME_IN_MINUTES;

/**
 * The JClouds version of the Jenkins Cloud.
File
JCloudsCloud.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
     * @see CloudInstanceDefaults#DEFAULT_INSTANCE_RETENTION_TIME_IN_MINUTES
     */
    public int getRetentionTime() {
<<<<<<< HEAD
        if (null != overrideRetentionTime) {
            return overrideRetentionTime.intValue();
        } else {
            return JCloudsCloud.getByName(cloudName).getRetentionTime();
=======
        if (overrideRetentionTime > 0) {
            return overrideRetentionTime;
>>>>>>> e4f8cdcc8b54c897e626a5aa3f0b179d42b52d93
        }

        JCloudsCloud cloud = JCloudsCloud.getByName(cloudName);
Solution content 
     * @see CloudInstanceDefaults#DEFAULT_INSTANCE_RETENTION_TIME_IN_MINUTES
     */
    public int getRetentionTime() {
        if (null != overrideRetentionTime) {
            return overrideRetentionTime.intValue();
        }
File
JCloudsSlave.java
Developer's decision
Combination
Kind of conflict
Attribute
If statement
Method invocation
Return statement
Chunk
Conflicting content 
        // TODO: this may need to vary per test
        cloud = new JCloudsCloud(fixture.getProvider() + "-profile", fixture.getProvider(), fixture.getIdentity(), fixture.getCredential(),
<<<<<<< HEAD
                null, fixture.getEndpoint(), 1, 30, 600 * 1000, 600 * 1000, null,
=======
                generatedKeys.get("private"), generatedKeys.get("public"), fixture.getEndpoint(), 1, DEFAULT_INSTANCE_RETENTION_TIME_IN_MINUTES, 600 * 1000, 600 * 1000, null,
>>>>>>> e4f8cdcc8b54c897e626a5aa3f0b179d42b52d93
                Collections.emptyList());
    }
Solution content 
        // TODO: this may need to vary per test
        cloud = new JCloudsCloud(fixture.getProvider() + "-profile", fixture.getProvider(), fixture.getIdentity(), fixture.getCredential(),
                null, fixture.getEndpoint(), 1, DEFAULT_INSTANCE_RETENTION_TIME_IN_MINUTES, 600 * 1000, 600 * 1000, null,
                Collections.emptyList());
    }
File
JCloudsCloudInsideJenkinsLiveTest.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
        // TODO: this may need to vary per test
        cloud = new JCloudsCloud(fixture.getProvider() + "-profile", fixture.getProvider(), fixture.getIdentity(), fixture.getCredential(),
<<<<<<< HEAD
                null, fixture.getEndpoint(), 1, 30, 600 * 1000, 600 * 1000, null,
=======
                generatedKeys.get("private"), generatedKeys.get("public"), fixture.getEndpoint(), 1, DEFAULT_INSTANCE_RETENTION_TIME_IN_MINUTES, 600 * 1000, 600 * 1000, null,
>>>>>>> e4f8cdcc8b54c897e626a5aa3f0b179d42b52d93
                Collections.emptyList());
    }
Solution content 
        // TODO: this may need to vary per test
        cloud = new JCloudsCloud(fixture.getProvider() + "-profile", fixture.getProvider(), fixture.getIdentity(), fixture.getCredential(),
                null, fixture.getEndpoint(), 1, DEFAULT_INSTANCE_RETENTION_TIME_IN_MINUTES, 600 * 1000, 600 * 1000, null,
                Collections.emptyList());
    }
File
JCloudsCloudLiveTest.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
    @Test
    public void testConfigRoundtrip() throws Exception {

<<<<<<< HEAD
        JCloudsCloud original = new JCloudsCloud("aws-profile", "aws-ec2", "identity", "credential", "", "endPointUrl", 1, 30,
=======
        JCloudsCloud original = new JCloudsCloud("aws-profile", "aws-ec2", "identity", "credential", "privateKey", "publicKey", "endPointUrl", 1, DEFAULT_INSTANCE_RETENTION_TIME_IN_MINUTES,
>>>>>>> e4f8cdcc8b54c897e626a5aa3f0b179d42b52d93
                600 * 1000, 600 * 1000, null, Collections.emptyList());

        j.getInstance().clouds.add(original);
Solution content 
    @Test
    public void testConfigRoundtrip() throws Exception {

        JCloudsCloud original = new JCloudsCloud("aws-profile", "aws-ec2", "identity", "credential", "", "endPointUrl", 1,
                DEFAULT_INSTANCE_RETENTION_TIME_IN_MINUTES, 600 * 1000, 600 * 1000, null, Collections.emptyList());

        j.getInstance().clouds.add(original);
File
JCloudsCloudTest.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
 */
public class JCloudsSlaveTemplateTest {

<<<<<<< HEAD
    @Rule public JenkinsRule j = new JenkinsRule();
=======
    public void testConfigRoundtrip() throws Exception {
        String name = "testSlave";
        JCloudsSlaveTemplate originalTemplate = new JCloudsSlaveTemplate(name, "imageId", null, "hardwareId", 1, 512, "osFamily", "osVersion", "locationId",
                "jclouds-slave-type1 jclouds-type2", "Description", "initScript", null, "1", false, null, null, true,
                "jvmOptions", false, null, false,
                false, 5, 0, true, false, 0, "jenkins", true, "network1_id,network2_id", "security_group1,security_group2", null);

        List templates = new ArrayList();
        templates.add(originalTemplate);

        JCloudsCloud originalCloud = new JCloudsCloud("aws-profile", "aws-ec2", "identity", "credential", "privateKey", "publicKey", "endPointUrl", 1, DEFAULT_INSTANCE_RETENTION_TIME_IN_MINUTES,
                600 * 1000, 600 * 1000, null, templates);

        hudson.clouds.add(originalCloud);
        submit(createWebClient().goTo("configure").getFormByName("config"));

        assertEqualBeans(originalCloud, JCloudsCloud.getByName("aws-profile"), "profile,providerName,identity,credential,privateKey,publicKey,endPointUrl");

        assertEqualBeans(originalTemplate, JCloudsCloud.getByName("aws-profile").getTemplate(name),
                "name,cores,ram,osFamily,osVersion,labelString,description,initScript,numExecutors,stopOnTerminate");
>>>>>>> e4f8cdcc8b54c897e626a5aa3f0b179d42b52d93

    @Test
    public void testConfigRoundtrip() throws Exception {
Solution content 
 */
public class JCloudsSlaveTemplateTest {

    @Rule public JenkinsRule j = new JenkinsRule();

    @Test
    public void testConfigRoundtrip() throws Exception {
File
JCloudsSlaveTemplateTest.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Method signature
Variable