diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..4bb1587 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,81 @@ +version: "2" + +services: + zk: + image: rdelvalle/zookeeper + restart: on-failure + ports: + - "2181:2181" + environment: + ZK_CONFIG: tickTime=2000,initLimit=10,syncLimit=5,maxClientCnxns=128,forceSync=no,clientPort=2181 + ZK_ID: 1 + networks: + aurora_cluster: + ipv4_address: 192.168.33.2 + + master: + image: mesosphere/mesos-master:1.5.0 + restart: on-failure + ports: + - "5050:5050" + environment: + MESOS_ZK: zk://192.168.33.2:2181/mesos + MESOS_QUORUM: 1 + MESOS_HOSTNAME: localhost + MESOS_CLUSTER: test-cluster + MESOS_REGISTRY: replicated_log + networks: + aurora_cluster: + ipv4_address: 192.168.33.3 + depends_on: + - zk + + agent-one: + image: rdelvalle/mesos-agent:1.5.0 + pid: host + restart: on-failure + ports: + - "5051:5051" + environment: + MESOS_MASTER: zk://192.168.33.2:2181/mesos + MESOS_CONTAINERIZERS: docker,mesos + MESOS_PORT: 5051 + MESOS_HOSTNAME: localhost + MESOS_RESOURCES: ports(*):[11000-11999] + MESOS_SYSTEMD_ENABLE_SUPPORT: 'false' + MESOS_WORK_DIR: /tmp/mesos + networks: + aurora_cluster: + ipv4_address: 192.168.33.4 + + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup + - /var/run/docker.sock:/var/run/docker.sock + depends_on: + - zk + + aurora-one: + image: rdelvalle/aurora:0.20.0 + pid: host + ports: + - "8081:8081" + restart: on-failure + environment: + CLUSTER_NAME: test-cluster + ZK_ENDPOINTS: "192.168.33.2:2181" + MESOS_MASTER: "zk://192.168.33.2:2181/mesos" + networks: + aurora_cluster: + ipv4_address: 192.168.33.7 + depends_on: + - zk + - master + - agent-one + +networks: + aurora_cluster: + driver: bridge + ipam: + config: + - subnet: 192.168.33.0/16 + gateway: 192.168.33.1 \ No newline at end of file diff --git a/realis_e2e_test.go b/realis_e2e_test.go index cbf2804..d21ff09 100644 --- a/realis_e2e_test.go +++ b/realis_e2e_test.go @@ -69,7 +69,7 @@ func TestNonExistentEndpoint(t *testing.T) { Jitter: 0.1} // Attempt to connect to a bad endpoint - r, err := realis.NewRealisClient(realis.SchedulerUrl("http://127.0.0.1:8081/doesntexist/"), + r, err := realis.NewRealisClient(realis.SchedulerUrl("http://192.168.33.7:8081/doesntexist/"), realis.TimeoutMS(200), realis.BackOff(backoff), ) @@ -92,11 +92,11 @@ func TestNonExistentEndpoint(t *testing.T) { } func TestLeaderFromZK(t *testing.T) { - cluster := realis.GetDefaultClusterFromZKUrl("192.168.33.7:2181") + cluster := realis.GetDefaultClusterFromZKUrl("192.168.33.2:2181") url, err := realis.LeaderFromZK(*cluster) assert.NoError(t, err) - assert.Equal(t, "http://aurora.local:8081", url) + assert.Equal(t, "http://192.168.33.7:8081", url) } func TestRealisClient_ReestablishConn(t *testing.T) { @@ -295,7 +295,7 @@ func TestRealisClient_ScheduleCronJob_Thermos(t *testing.T) { } func TestRealisClient_DrainHosts(t *testing.T) { - hosts := []string{"192.168.33.7"} + hosts := []string{"localhost"} _, _, err := r.DrainHosts(hosts...) if err != nil { fmt.Printf("error: %+v\n", err.Error()) @@ -308,7 +308,7 @@ func TestRealisClient_DrainHosts(t *testing.T) { []aurora.MaintenanceMode{aurora.MaintenanceMode_DRAINED, aurora.MaintenanceMode_DRAINING}, 1, 50) - assert.Equal(t, map[string]bool{"192.168.33.7": true}, hostResults) + assert.Equal(t, map[string]bool{"localhost": true}, hostResults) assert.NoError(t, err) t.Run("TestRealisClient_MonitorNontransitioned", func(t *testing.T) { @@ -321,7 +321,7 @@ func TestRealisClient_DrainHosts(t *testing.T) { // Assert monitor returned an error that was not nil, and also a list of the non-transitioned hosts assert.Error(t, err) - assert.Equal(t, map[string]bool{"192.168.33.7": true, "IMAGINARY_HOST": false}, hostResults) + assert.Equal(t, map[string]bool{"localhost": true, "IMAGINARY_HOST": false}, hostResults) }) t.Run("TestRealisClient_EndMaintenance", func(t *testing.T) {