@@ -14,7 +14,7 @@
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
||||
*/
|
||||
*/
|
||||
package install
|
||||
|
||||
import (
|
||||
@@ -30,4 +30,4 @@ func init() {
|
||||
|
||||
func Install(c *restful.Container) {
|
||||
urlruntime.Must(devopsv1alpha2.AddToContainer(c))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
||||
*/
|
||||
*/
|
||||
package v1alpha2
|
||||
|
||||
import (
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
||||
*/
|
||||
*/
|
||||
package devops
|
||||
|
||||
import (
|
||||
|
||||
@@ -262,6 +262,7 @@ func CreateDevopsProject(req *restful.Request, resp *restful.Response) {
|
||||
err := req.ReadEntity(&devops)
|
||||
|
||||
if err != nil {
|
||||
glog.Infof("%+v", err)
|
||||
resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
|
||||
return
|
||||
}
|
||||
@@ -270,6 +271,7 @@ func CreateDevopsProject(req *restful.Request, resp *restful.Response) {
|
||||
project, err, code := tenant.CreateDevopsProject(username, workspaceName, &devops)
|
||||
|
||||
if err != nil {
|
||||
glog.Errorf("%+v", err)
|
||||
resp.WriteHeaderAndEntity(code, errors.Wrap(err))
|
||||
return
|
||||
}
|
||||
|
||||
@@ -24,6 +24,12 @@ import (
|
||||
"time"
|
||||
)
|
||||
|
||||
const (
|
||||
Git = "git"
|
||||
Hg = "hg"
|
||||
Svn = "svc"
|
||||
)
|
||||
|
||||
type Build struct {
|
||||
Raw *BuildResponse
|
||||
Job *Job
|
||||
@@ -392,7 +398,7 @@ func (b *Build) GetDuration() int64 {
|
||||
func (b *Build) GetRevision() string {
|
||||
vcs := b.Raw.ChangeSet.Kind
|
||||
|
||||
if vcs == "git" || vcs == "hg" {
|
||||
if vcs == Git || vcs == Hg {
|
||||
for _, a := range b.Raw.Actions {
|
||||
if a.LastBuiltRevision.SHA1 != "" {
|
||||
return a.LastBuiltRevision.SHA1
|
||||
@@ -401,7 +407,7 @@ func (b *Build) GetRevision() string {
|
||||
return a.MercurialRevisionNumber
|
||||
}
|
||||
}
|
||||
} else if vcs == "svn" {
|
||||
} else if vcs == Svn {
|
||||
return strconv.Itoa(b.Raw.ChangeSet.Revisions[0].Revision)
|
||||
}
|
||||
return ""
|
||||
@@ -409,7 +415,7 @@ func (b *Build) GetRevision() string {
|
||||
|
||||
func (b *Build) GetRevisionBranch() string {
|
||||
vcs := b.Raw.ChangeSet.Kind
|
||||
if vcs == "git" {
|
||||
if vcs == Git {
|
||||
for _, a := range b.Raw.Actions {
|
||||
if len(a.LastBuiltRevision.Branch) > 0 && a.LastBuiltRevision.Branch[0].SHA1 != "" {
|
||||
return a.LastBuiltRevision.Branch[0].SHA1
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
||||
*/
|
||||
*/
|
||||
package devops
|
||||
|
||||
import (
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
||||
*/
|
||||
*/
|
||||
package devops
|
||||
|
||||
type JkError struct {
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
||||
*/
|
||||
*/
|
||||
package devops
|
||||
|
||||
// Some apis for Jenkins.
|
||||
|
||||
Reference in New Issue
Block a user