Skip to content

Commit ce52fdc

Browse files
committed
Final V2 merge from 'develop'
2 parents c843acc + 5796949 commit ce52fdc

32 files changed

+365
-104
lines changed

Dockerfile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM centos
2+
3+
LABEL MAINTAINER="Marcos Tenrero"
4+
5+
COPY ./releases/atq-director-linux-amd64 /atq/atq-amd64
6+
COPY controller-config.docker.yaml /controller-config.yaml
7+
8+
RUN mkdir -p /gluster/storage
9+
10+
EXPOSE 8080
11+
12+
RUN cd /atq
13+
14+
ENTRYPOINT [ "/atq/atq-amd64" ]

Gopkg.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,7 @@
5656
[[constraint]]
5757
name = "github.com/dghubble/sling"
5858
version = "1.1.0"
59+
60+
[[constraint]]
61+
name = "github.com/mholt/archiver"
62+
version = "2.0.0"

Jenkinsfile

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pipeline {
1919
sh 'go get -u github.com/golang/lint/golint'
2020
sh 'go get -u github.com/tebeka/go2xunit'
2121
sh 'go get -u golang.org/x/tools/cmd/cover'
22-
sh 'go get -u github.com/mattn/goveralls'
22+
sh 'go get -u github.com/mtenrero/goveralls'
2323
}
2424
}
2525

@@ -35,7 +35,18 @@ pipeline {
3535
}
3636
}
3737

38+
stage('Code Coverage') {
39+
environment {
40+
COVERTOKEN = credentials('coveralls-token')
41+
}
42+
43+
steps {
44+
sh 'cd $GOPATH/src/github.com/mtenrero/ATQ-Director && goveralls -coverprofile=coverage.txt -repotoken $COVERTOKEN'
45+
}
46+
}
47+
3848
stage('Build') {
49+
when { expression { env.BRANCH_NAME == 'master' } }
3950
steps {
4051
sh 'cd $GOPATH/src/github.com/mtenrero/ATQ-Director && ./build.sh'
4152
}

README.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Automation Test Queue (ATQ): Director
22

3-
[![Build Status](http://ec2-35-177-127-126.eu-west-2.compute.amazonaws.com:8080/buildStatus/icon?job=ATQ/master)](http://ec2-35-177-127-126.eu-west-2.compute.amazonaws.com:8080/job/ATQ/job/master/)
4-
[![Coverage Status](https://coveralls.io/repos/github/mtenrero/ATQ-Director/badge.svg)](https://coveralls.io/github/mtenrero/ATQ-Director)
3+
[![Build Status](http://atq.mtenrero.com:8080/buildStatus/icon?job=ATQ/master)](http://atq.mtenrero.com:8080/job/ATQ/job/master/)
4+
[![Coverage Status](https://coveralls.io/repos/github/mtenrero/ATQ-Director/badge.svg?branch=master)](https://coveralls.io/github/mtenrero/ATQ-Director?branch=master)
55
[![API Documentation](https://img.shields.io/badge/API-Documentation-orange.svg)](https://editor2.swagger.io/?url=https://raw.githubusercontent.com/mtenrero/ATQ-Director/master/swagger/swagger.yaml)
66

77
Automation Test Queue is a server-side binary which exposes a HTTP API and communicates with the Docker subsystem.
@@ -43,7 +43,8 @@ And the following versions will be `https:\\host:port\v2...`
4343
You can specify which images are available to use with ATQ for security reasons with a YAML configuration file with the following structure:
4444

4545
```yaml
46-
port: 9050
46+
port: 8080
47+
glusterPath: ...
4748
images:
4849
- imageName: mtenrero/jmeter
4950
args:
@@ -57,6 +58,12 @@ images:
5758
5859
All images specified in this file will be pulled from the registries to make them available instantly when requested, so starting time may be increased in the first launch.
5960
61+
### GlusterPath
62+
63+
GlusterPath represents the path on the filsystem which is shared between Docker Swarm nodes in order to ATQ middlewara data be available from all nodes.
64+
65+
It has been tested with GlusterFS and Samba.
66+
6067
### **Images**
6168
6269
Images contain a list with the enabled images available to use with ATQ-Director
@@ -92,8 +99,3 @@ Any feature should be well documented and tested.
9299

93100
Godocs compatible code must be used.
94101

95-
## Disclaimer
96-
97-
**THIS IS AN INITIAL VERSION AND IT'S NOT COMPLETE !!**
98-
99-
_Guarantee it's not provided, use at your own risk._

app/contexts.go

Lines changed: 2 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/test/task_testing.go

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/task.go

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configLoader/controllerConfig.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package configLoader
22

33
// ControllerConfig contains all the configuration available for Controller Mode
44
type ControllerConfig struct {
5-
Port string `yaml:"port"`
6-
Images []Image `yaml:"images"`
5+
Port string `yaml:"port"`
6+
Images []Image `yaml:"images"`
7+
GlusterPath string `yaml:"glusterpath"`
78
}

configLoader/controllerConfig_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,9 @@ func TestLoadControllerConfigYamlFileErr(t *testing.T) {
2424
t.Log(err)
2525
}
2626
}
27+
28+
func TestLoadControllerMalformedYaml(t *testing.T) {
29+
_, err := LoadControllerConfigYaml("../Gopkg.toml")
30+
31+
assert.Error(t, err, "Error not fired reading malformed yaml")
32+
}

controller-config.docker.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
port: 8080
2+
glusterpath: /gluster
3+
images:
4+
- imageName: mtenrero/jmeter
5+
args:
6+
- name: MODE
7+
required: true
8+
- name: TEST_NAME
9+
required: false
10+
- name: REMOTES
11+
required: false

0 commit comments

Comments
 (0)