support the directed yaml file (#56)

caicloud · Nov 16, 2016 · 2f8d26f · 2f8d26f
1 parent 19ca183
commit 2f8d26f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/api/types.go b/api/types.go
@@ -75,6 +75,8 @@ type Service struct {
 	LastVersionName string `bson:"last_versionname,omitempty" json:"last_versionname,omitempty"`
 	// Deploy plans
 	DeployPlans []DeployPlan `bson:"deploy_plans,omitempty" json:"deploy_plans,omitempty"`
+	// Repository information of the service.
+	YAMLConfigName string `bson:"yaml_config_name,omitempty" json:"yaml_config_name,omitempty"`
 }
 
 // DeployPlan is the type for deployment plan.

diff --git a/scripts/tools/create-service.sh b/scripts/tools/create-service.sh
@@ -17,6 +17,7 @@ curl -sS -X POST -H "Content-Type:application/json" -d "{
    \"name\": \"test-service\",
    \"username\": \"${1}\",
    \"description\": \"This is a test-service\",
+   \"yaml_config_name\": \"caicloud.yml\",
    \"repository\": {
      \"url\": \"https://github.com/tutumcloud/hello-world\",
      \"vcs\": \"git\"

diff --git a/worker/ci/manager.go b/worker/ci/manager.go
@@ -139,13 +139,13 @@ func (cm *Manager) Parse(event *api.Event) (*parser.Tree, error) {
 	contextDir := contextdir.(string)
 	errYaml = ErrYamlNotExist
 	// Use the filename of config file if given.
-	/*if event.Service.YAMLConfigName != "" {
+	if event.Service.YAMLConfigName != "" {
 		directFilePath = fmt.Sprintf("%s/%s", contextDir, event.Service.YAMLConfigName)
 		// Set the err to ErrCustomYamlNotExist.
 		errYaml = ErrCustomYamlNotExist
-	} else {*/
-	directFilePath = fmt.Sprintf("%s/%s", contextDir, yamlName)
-	//}
+	} else {
+		directFilePath = fmt.Sprintf("%s/%s", contextDir, yamlName)
+	}
 	if osutil.IsFileExists(directFilePath) != true {
 		return nil, errYaml
 	}