Skip to content

Commit

Permalink
Replace github.hpe pending list to github.com
Browse files Browse the repository at this point in the history
  • Loading branch information
clarsonneur committed Feb 15, 2017
1 parent d14f138 commit b57c7e0
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTION.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ forjj is divided in 2 pieces:
Shortly, forjj manage an infra GIT repository and communicate with several plugins to do the real task.
This code is located in this repository
- forjj plugins: Application drivers for forjj.
This code is located in [https://github.hpe.com/forjj/forjj-contribs](forjj-contribs repository)
This code is located in [https://github.com/forj-oss/forjj-contribs](forjj-contribs repository)

Shortly, a plugin is a container started by forjj as a service. The plugin implements a REST API used by Forjj to communicate with.
The plugin itself implements all the logic to control/configure and install the application that forjj will use.
Expand Down
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Really? I can create a DevOps organization on my workstation??? Yes.
Here is the requirement:

- docker : You need a linux docker system, 1.9.1 or higher.
- github : To simplify, we use github.hpe.com for the SCM upstream part. You must have a valid account on github.hpe.com and a valid personal token. (`GITHUB_TOKEN`)
- github : To simplify, we use github.com for the SCM upstream part. You must have a valid account on github.com and a valid personal token. (`GITHUB_TOKEN`)

The token must have access to `admin:org, admin:repo_hook, admin:org_hook`
**NOTE**: The latest version of github entreprise do not authorize to create an organization from the API if you are not `siteadmin`. But You can usually create an organization from the web interface. Forjj github will take care of that.
Expand All @@ -59,7 +59,7 @@ If you do not want to build your own forjj version from source, you can get the

If you want a more stable version (source not changing too much...), you should build it yourself, as I'm pushing my code frequently when I consider it to be acceptable version. See [how to build it section](forjj#how-to-build-it-how-to-test-it).

NOTE: I'm using forjj to build forjj on github.hpe.com.
NOTE: I'm using forjj to build forjj on github.com.

# Run it

Expand All @@ -75,7 +75,7 @@ mkdir -p ~/bin && wget -O ~/bin/forjj http://lacws.emea.hpqcorp.net/Install_priv

```bash
GITHUB_TOKEN=d6603f803805a4e9f51ebf85d5668bf499f58331
forjj create ~/devops/myforj --apps ci:jenkins,ustream:github --github-server github.hpe.com --github-token $GITHUB_TOKEN --jenkins-addr myworkstation.emea.hpqcorp.net
forjj create ~/devops/myforj --apps ci:jenkins,ustream:github --github-token $GITHUB_TOKEN --jenkins-addr myworkstation.emea.hpqcorp.net
```

Then forjj will create in ~/devops/myforj :
Expand Down Expand Up @@ -137,8 +137,8 @@ As soon as you have defined the GOPATH variable, you could build forjj as follow
mkdir ~/src/go
export GOPATH=~/src/go
export PATH=$PATH:$GOPATH/bin
go get https://github.hpe.com/forjj/forjj.git
cd ~/src/go/src/github.hpe.com/forjj/forjj
go get https://github.com/forj-oss/forjj.git
cd ~/src/go/src/github.com/forj-oss/forjj
go get
go install
```
Expand All @@ -147,8 +147,8 @@ Now, `forjj` should work

For forjj github plugin:
```bash
go get https://github.hpe.com/forjj/forjj-contribs
cd ~/src/go/src/github.hpe.com/forjj/forjj-contribs/upstream/github
go get https://github.com/forj-oss/forjj-contribs
cd ~/src/go/src/github.com/forj-oss/forjj-contribs/upstream/github
go generate
bin/build.sh
```
Expand All @@ -158,8 +158,8 @@ Now, a new docker image has been generated, called `docker.hos.hpecorp.net/forjj

For forjj jenkins plugin:
```bash
go get https://github.hpe.com/forjj/forjj-contribs
cd ~/src/go/src/github.hpe.com/forjj/forjj-contribs/ci/jenkins
go get https://github.com/forj-oss/forjj-contribs
cd ~/src/go/src/github.com/forj-oss/forjj-contribs/ci/jenkins
go generate
bin/build.sh
```
Expand All @@ -185,15 +185,15 @@ forjj create ~/tmp/forjj
# create source code for github
# write github source code, add and commit it
# Instantiate github configuration as described by the generated code.
forjj create ~/tmp/forjj --debug --apps ci:jenkins,upstream:github --github-token $GITHUB_TOKEN --github-server github.hpe.com --jenkins-service-addr maison.emea.hpqcorp.net --docker-exe-path ~/tmp/docker
forjj create ~/tmp/forjj --debug --apps ci:jenkins,upstream:github --github-token $GITHUB_TOKEN --jenkins-service-addr maison.emea.hpqcorp.net --docker-exe-path ~/tmp/docker
```

```bash
# Create a worspace
# Create a workspace
# create source code for github
# write github source code, add and commit it
# Instantiate github configuration as described by the generated code.
forjj create ~/tmp/forjj --debug --apps ci:jenkins,upstream:github --github-token $GITHUB_TOKEN --github-server github.hpe.com --jenkins-service-addr maison.emea.hpqcorp.net --docker-exe-path ~/tmp/docker
forjj create ~/tmp/forjj --debug --apps ci:jenkins,upstream:github --github-token $GITHUB_TOKEN --jenkins-service-addr maison.emea.hpqcorp.net --docker-exe-path ~/tmp/docker
```

Thank you
20 changes: 10 additions & 10 deletions app.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package main

import (
"bytes"
"github.com/alecthomas/kingpin"
"github.com/forj-oss/forjj-modules/cli"
"github.com/forj-oss/forjj-modules/cli/kingpinCli"
Expand All @@ -12,7 +13,6 @@ import (
"os/exec"
"regexp"
"text/template"
"bytes"
)

// TODO: Support multiple contrib sources.
Expand Down Expand Up @@ -134,11 +134,11 @@ const (
)

const (
debug_f = "debug"
infra_f = "infra"
debug_f = "debug"
infra_f = "infra"
infra_upstream_f = "infra-upstream"
cred_f = "credentials-file"
orga_f = "organization"
cred_f = "credentials-file"
orga_f = "organization"
)

//
Expand Down Expand Up @@ -172,11 +172,11 @@ func (a *Forj) init() {

a.cli.AddAppFlag(cli.String, cred_f, forjj_creds_help, opts_creds_file)

u, _ := url.Parse("https://github.hpe.com/forj/forjj-contribs/raw/master")
u, _ := url.Parse("https://github.com/forj-oss/forjj-contribs/raw/master")
a.ContribRepo_uri = u
u, _ = url.Parse("https://github.hpe.com/forj/forjj-repotemplates/raw/master")
u, _ = url.Parse("https://github.com/forj-oss/forjj-repotemplates/raw/master")
a.RepotemplateRepo_uri = u
u, _ = url.Parse("https://github.hpe.com/forj/forjj-flows/raw/master")
u, _ = url.Parse("https://github.com/forj-oss/forjj-flows/raw/master")
a.FlowRepo_uri = u

a.drivers = make(map[string]*Driver)
Expand Down Expand Up @@ -371,7 +371,7 @@ func (a *Forj) init() {
// LoadInternalData()
func (a *Forj) LoadInternalData() {
a.InternalForjData = make(map[string]string)
ldata := []string{ "organization", "infra", "infra-upstream", "instance-name", "source-mount", "workspace-mount"}
ldata := []string{"organization", "infra", "infra-upstream", "instance-name", "source-mount", "workspace-mount"}
for _, param := range ldata {
a.InternalForjData[param] = a.getInternalData(param)
}
Expand All @@ -388,7 +388,7 @@ func (a *Forj) getInternalData(param string) (result string) {
result = a.w.Infra.Name
case "infra-upstream":
if a.w.Instance == "" || a.w.Instance == "none" {
result= ""
result = ""
} else {
result = a.w.Infra.GetUpstream()
}
Expand Down
2 changes: 1 addition & 1 deletion glide.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package: github.hpe.com/christophe-larsonneur/forjj
package: github.com/forj-oss/forjj
import:
- package: github.com/alecthomas/kingpin
repo: https://github.com/clarsonneur/kingpin
Expand Down
2 changes: 1 addition & 1 deletion help.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const (
His role is to help you building and maintaining an automated Software factory by integrating several tools together,
implemented with the 'Infrastructure as Code' idea.
For details on Forjj, visit https://github.hpe.com/forjj/forjj
For details on Forjj, visit https://github.com/forj-oss/forjj
'Infrastructure as Code' is part of DevOps (automation). FORJJ can help you create/update/maintain your DevOps solution.
But FORJJ is not DevOps if you do not help your teams to do DevOps (DevOps Culture).
Expand Down

0 comments on commit b57c7e0

Please sign in to comment.