Skip to content
Permalink
Browse files

redhat-developer/odo -> openshift/odo (#1505)

* redhat-developer/odo -> openshift/odo

* gofmt

* add CircleCI tests temporary back to TravisCI
  • Loading branch information...
kadel committed Mar 21, 2019
1 parent 7edbd53 commit 6bd0d73dc67e014e34f7e92a35dab26734163afc
Showing with 645 additions and 581 deletions.
  1. +12 −12 .circleci/config.yml
  2. +1 −1 .github/ISSUE_TEMPLATE/Documentation.md
  3. +67 −3 .travis.yml
  4. +23 −23 Makefile
  5. +16 −16 README.md
  6. +1 −1 cmd/cli-doc/cli-doc.go
  7. +5 −5 cmd/odo/odo.go
  8. +2 −2 docs/cli-reference.md
  9. +16 −16 docs/development.md
  10. +2 −2 docs/installation.md
  11. +1 −1 glide.yaml
  12. +1 −1 openshift-ci/build-root/README.md
  13. +6 −6 pkg/application/application.go
  14. +6 −6 pkg/application/application_test.go
  15. +1 −1 pkg/auth/login.go
  16. +2 −2 pkg/catalog/catalog.go
  17. +2 −2 pkg/catalog/catalog_test.go
  18. +8 −8 pkg/component/component.go
  19. +4 −4 pkg/component/component_test.go
  20. +1 −1 pkg/component/labels/labels.go
  21. +1 −1 pkg/component/labels/labels_test.go
  22. +2 −2 pkg/component/watch.go
  23. +2 −2 pkg/component/watch_test.go
  24. +2 −2 pkg/config/config.go
  25. +1 −1 pkg/config/config_test.go
  26. +1 −1 pkg/log/status.go
  27. +2 −2 pkg/notify/notify.go
  28. +7 −7 pkg/occlient/occlient.go
  29. +4 −4 pkg/occlient/occlient_test.go
  30. +2 −2 pkg/occlient/templates.go
  31. +11 −11 pkg/odo/cli/application/application.go
  32. +5 −5 pkg/odo/cli/application/create.go
  33. +7 −7 pkg/odo/cli/application/delete.go
  34. +8 −8 pkg/odo/cli/application/describe.go
  35. +3 −3 pkg/odo/cli/application/get.go
  36. +5 −5 pkg/odo/cli/application/list.go
  37. +5 −5 pkg/odo/cli/application/set.go
  38. +4 −4 pkg/odo/cli/catalog/catalog.go
  39. +1 −1 pkg/odo/cli/catalog/describe/describe.go
  40. +2 −2 pkg/odo/cli/catalog/describe/service.go
  41. +3 −3 pkg/odo/cli/catalog/list/components.go
  42. +1 −1 pkg/odo/cli/catalog/list/list.go
  43. +4 −4 pkg/odo/cli/catalog/list/services.go
  44. +3 −3 pkg/odo/cli/catalog/search/component.go
  45. +1 −1 pkg/odo/cli/catalog/search/search.go
  46. +4 −4 pkg/odo/cli/catalog/search/service.go
  47. +2 −2 pkg/odo/cli/catalog/util/util.go
  48. +2 −2 pkg/odo/cli/catalog/util/util_test.go
  49. +16 −16 pkg/odo/cli/cli.go
  50. +7 −7 pkg/odo/cli/component/common_link.go
  51. +9 −9 pkg/odo/cli/component/component.go
  52. +16 −16 pkg/odo/cli/component/create.go
  53. +8 −8 pkg/odo/cli/component/delete.go
  54. +6 −6 pkg/odo/cli/component/describe.go
  55. +4 −4 pkg/odo/cli/component/get.go
  56. +6 −6 pkg/odo/cli/component/link.go
  57. +6 −6 pkg/odo/cli/component/list.go
  58. +6 −6 pkg/odo/cli/component/log.go
  59. +8 −8 pkg/odo/cli/component/push.go
  60. +6 −6 pkg/odo/cli/component/set.go
  61. +7 −7 pkg/odo/cli/component/ui/ui.go
  62. +5 −5 pkg/odo/cli/component/unlink.go
  63. +8 −8 pkg/odo/cli/component/update.go
  64. +8 −8 pkg/odo/cli/component/watch.go
  65. +2 −2 pkg/odo/cli/config/config.go
  66. +3 −3 pkg/odo/cli/config/set.go
  67. +3 −3 pkg/odo/cli/config/unset.go
  68. +3 −3 pkg/odo/cli/config/view.go
  69. +3 −3 pkg/odo/cli/login/login.go
  70. +2 −2 pkg/odo/cli/logout/logout.go
  71. +2 −2 pkg/odo/cli/preference/preference.go
  72. +4 −4 pkg/odo/cli/preference/set.go
  73. +4 −4 pkg/odo/cli/preference/unset.go
  74. +3 −3 pkg/odo/cli/preference/view.go
  75. +3 −3 pkg/odo/cli/project/create.go
  76. +4 −4 pkg/odo/cli/project/delete.go
  77. +2 −2 pkg/odo/cli/project/get.go
  78. +2 −2 pkg/odo/cli/project/list.go
  79. +10 −10 pkg/odo/cli/project/project.go
  80. +3 −3 pkg/odo/cli/project/set.go
  81. +7 −7 pkg/odo/cli/service/create.go
  82. +5 −5 pkg/odo/cli/service/delete.go
  83. +3 −3 pkg/odo/cli/service/list.go
  84. +3 −3 pkg/odo/cli/service/service.go
  85. +5 −5 pkg/odo/cli/service/service_test.go
  86. +3 −3 pkg/odo/cli/service/ui/ui.go
  87. +2 −2 pkg/odo/cli/service/ui/ui_test.go
  88. +7 −7 pkg/odo/cli/storage/create.go
  89. +8 −8 pkg/odo/cli/storage/delete.go
  90. +9 −9 pkg/odo/cli/storage/list.go
  91. +7 −7 pkg/odo/cli/storage/mount.go
  92. +3 −3 pkg/odo/cli/storage/storage.go
  93. +1 −1 pkg/odo/cli/storage/storage_test.go
  94. +7 −7 pkg/odo/cli/storage/unmount.go
  95. +1 −1 pkg/odo/cli/ui/common.go
  96. +4 −4 pkg/odo/cli/url/create.go
  97. +5 −5 pkg/odo/cli/url/delete.go
  98. +4 −4 pkg/odo/cli/url/list.go
  99. +4 −4 pkg/odo/cli/url/url.go
  100. +2 −2 pkg/odo/cli/utils/terminal.go
  101. +1 −1 pkg/odo/cli/utils/utils.go
  102. +6 −6 pkg/odo/cli/version/version.go
  103. +6 −6 pkg/odo/genericclioptions/context.go
  104. +1 −1 pkg/odo/genericclioptions/fakecontext.go
  105. +1 −1 pkg/odo/genericclioptions/runnable.go
  106. +5 −5 pkg/odo/util/cmdutils.go
  107. +1 −1 pkg/odo/util/completion/completion.go
  108. +10 −10 pkg/odo/util/completion/completionhandlers.go
  109. +6 −6 pkg/odo/util/completion/completionhandlers_test.go
  110. +1 −1 pkg/odo/util/validation/validators.go
  111. +1 −1 pkg/preference/preference.go
  112. +1 −1 pkg/preference/preference_test.go
  113. +3 −3 pkg/project/project.go
  114. +2 −2 pkg/project/project_test.go
  115. +3 −3 pkg/secret/secret.go
  116. +3 −3 pkg/secret/secret_test.go
  117. +5 −5 pkg/service/service.go
  118. +4 −4 pkg/service/service_test.go
  119. +1 −1 pkg/storage/labels/labels.go
  120. +2 −2 pkg/storage/labels/labels_test.go
  121. +6 −6 pkg/storage/storage.go
  122. +2 −2 pkg/storage/storage_test.go
  123. +1 −1 pkg/testingutil/configs.go
  124. +2 −2 pkg/testingutil/services.go
  125. +1 −1 pkg/url/labels/labels.go
  126. +2 −2 pkg/url/labels/labels_test.go
  127. +5 −5 pkg/url/url.go
  128. +4 −4 pkg/url/url_test.go
  129. +3 −3 scripts/generate-bintray-json.sh
  130. +1 −1 scripts/generate-coverage.sh
  131. +3 −3 scripts/install.sh
  132. +3 −3 scripts/sync-docs.sh
  133. +2 −2 tests/e2e/component.go
  134. +6 −6 tests/e2e/watch_test.go
@@ -9,7 +9,7 @@ jobs:
machine: true
environment:
GOVERSION: 1.11.4
working_directory: ~/go/src/github.com/redhat-developer/odo
working_directory: ~/go/src/github.com/openshift/odo

steps:
- checkout
@@ -28,7 +28,7 @@ jobs:
command: |
go version
env
cd $GOPATH/src/github.com/redhat-developer/odo
cd $GOPATH/src/github.com/openshift/odo
make goget-tools
make
sudo cp odo /usr/bin
@@ -37,7 +37,7 @@ jobs:
# name: oc cluster up
# command: |
# pwd
# cd $GOPATH/src/github.com/redhat-developer/odo
# cd $GOPATH/src/github.com/openshift/odo
# pwd
# ls
# ./scripts/oc-cluster.sh service-catalog
@@ -72,56 +72,56 @@ jobs:
- run:
name: Main e2e test
command: |
cd ${HOME}/go/src/github.com/redhat-developer/odo
cd ${HOME}/go/src/github.com/openshift/odo
make test-main-e2e
- run:
name: Login e2e test
command: |
cd ${HOME}/go/src/github.com/redhat-developer/odo
cd ${HOME}/go/src/github.com/openshift/odo
make test-odo-login-e2e
# login e2e test leave oc client in logged out state
oc login -u developer -p developer
- run:
name: Component e2e test
command: |
cd ${HOME}/go/src/github.com/redhat-developer/odo
cd ${HOME}/go/src/github.com/openshift/odo
make test-cmp-e2e
- run:
name: Java e2e test
command: |
cd ${HOME}/go/src/github.com/redhat-developer/odo
cd ${HOME}/go/src/github.com/openshift/odo
make test-java-e2e
- run:
name: Source e2e test
command: |
cd ${HOME}/go/src/github.com/redhat-developer/odo
cd ${HOME}/go/src/github.com/openshift/odo
make test-source-e2e
# - run:
# name: Service-Catalog e2e tests
# command: |
# cd ${HOME}/go/src/github.com/redhat-developer/odo
# cd ${HOME}/go/src/github.com/openshift/odo
# make test-service-e2e
#
# - run:
# name: Watch e2e tests
# command: |
# cd ${HOME}/go/src/github.com/redhat-developer/odo
# cd ${HOME}/go/src/github.com/openshift/odo
# make test-watch-e2e TIMEOUT=1200s
#
# - run:
# name: Link e2e tests
# command: |
# cd ${HOME}/go/src/github.com/redhat-developer/odo
# cd ${HOME}/go/src/github.com/openshift/odo
# make test-link-e2e

- run:
name: JSON e2e test
command: |
cd ${HOME}/go/src/github.com/redhat-developer/odo
cd ${HOME}/go/src/github.com/openshift/odo
make test-json-format-output
@@ -8,7 +8,7 @@ about: Report mistakes or request for documentation
Welcome! - We kindly ask you to:
1. Check the documents under https://github.com/redhat-developer/odo/tree/master/docs
1. Check the documents under https://github.com/openshift/odo/tree/master/docs
2. Use the chat and talk to us if you have a question/doubt rather than a documentat mistake or request.
The chat room is at: https://chat.openshift.io/developers/channels/odo
@@ -12,7 +12,7 @@ jobs:
# YAML alias, for settings shared across the tests
- &base-test
stage: test
go_import_path: github.com/redhat-developer/odo
go_import_path: github.com/openshift/odo
go: "1.11.2"
install:
- make goget-tools
@@ -31,6 +31,70 @@ jobs:
# submit coverage.txt to codecov.io
- bash <(curl -s https://codecov.io/bash)

# BEGIN Tests that are also in CircleCI

- <<: *base-test
stage: test
name: "Main e2e tests"
script:
- ./scripts/oc-cluster.sh
- make bin
- sudo cp odo /usr/bin
- oc login -u developer
- travis_wait make test-main-e2e

- <<: *base-test
stage: test
name: "Login e2e tests"
script:
- ./scripts/oc-cluster.sh
- make bin
- sudo cp odo /usr/bin
- oc login -u developer
- travis_wait make test-odo-login-e2e

- <<: *base-test
stage: test
name: "Component e2e tests"
script:
- ./scripts/oc-cluster.sh
- make bin
- sudo cp odo /usr/bin
- oc login -u developer
- travis_wait make test-cmp-e2e

- <<: *base-test
stage: test
name: "Java e2e tests"
script:
- ./scripts/oc-cluster.sh
- make bin
- sudo cp odo /usr/bin
- oc login -u developer
- travis_wait make test-java-e2e

- <<: *base-test
stage: test
name: "Source e2e tests"
script:
- ./scripts/oc-cluster.sh
- make bin
- sudo cp odo /usr/bin
- oc login -u developer
- travis_wait make test-source-e2e

- <<: *base-test
stage: test
name: "Json e2e tests"
script:
- ./scripts/oc-cluster.sh
- make bin
- sudo cp odo /usr/bin
- oc login -u developer
- travis_wait make test-json-format-output

# END Tests that are also in CircleCI

# Run component e2e tests
- <<: *base-test
stage: test
@@ -93,7 +157,7 @@ jobs:
- stage: deploy
# run this stage only on master branch and on tags
if: branch = master || tag IS present
go_import_path: github.com/redhat-developer/odo
go_import_path: github.com/openshift/odo
go: "1.11.2"
env: BUILD_DOCS=yes
install:
@@ -128,7 +192,7 @@ jobs:
skip_cleanup: true
on:
tags: true
repo: redhat-developer/odo
repo: openshift/odo
# upload packages to bintray repositories
- provider: script
skip_cleanup: true
@@ -1,4 +1,4 @@
PROJECT := github.com/redhat-developer/odo
PROJECT := github.com/openshift/odo
GITCOMMIT := $(shell git rev-parse --short HEAD 2>/dev/null)
PKGS := $(shell go list ./... | grep -v $(PROJECT)/vendor)
COMMON_FLAGS := -X $(PROJECT)/pkg/odo/cli/version.GITCOMMIT=$(GITCOMMIT)
@@ -93,99 +93,99 @@ test:
.PHONY: test-main-e2e
test-main-e2e:
ifdef TIMEOUT
go test -v github.com/redhat-developer/odo/tests/e2e --ginkgo.focus="odoe2e" -ginkgo.succinct -timeout $(TIMEOUT)
go test -v github.com/openshift/odo/tests/e2e --ginkgo.focus="odoe2e" -ginkgo.succinct -timeout $(TIMEOUT)
else
go test -v github.com/redhat-developer/odo/tests/e2e --ginkgo.focus="odoe2e" -ginkgo.succinct
go test -v github.com/openshift/odo/tests/e2e --ginkgo.focus="odoe2e" -ginkgo.succinct
endif

# Run json outout tests
.PHONY: test-json-format-output
test-json-format-output:
ifdef TIMEOUT
go test -v github.com/redhat-developer/odo/tests/e2e --ginkgo.focus="odojsonoutput" -ginkgo.succinct -timeout $(TIMEOUT)
go test -v github.com/openshift/odo/tests/e2e --ginkgo.focus="odojsonoutput" -ginkgo.succinct -timeout $(TIMEOUT)
else
go test -v github.com/redhat-developer/odo/tests/e2e --ginkgo.focus="odojsonoutput" -ginkgo.succinct
go test -v github.com/openshift/odo/tests/e2e --ginkgo.focus="odojsonoutput" -ginkgo.succinct
endif

# Run component e2e tests
.PHONY: test-cmp-e2e
test-cmp-e2e:
ifdef TIMEOUT
go test -v github.com/redhat-developer/odo/tests/e2e --ginkgo.focus="odoCmpE2e" -ginkgo.succinct -timeout $(TIMEOUT)
go test -v github.com/openshift/odo/tests/e2e --ginkgo.focus="odoCmpE2e" -ginkgo.succinct -timeout $(TIMEOUT)
else
go test -v github.com/redhat-developer/odo/tests/e2e --ginkgo.focus="odoCmpE2e" -ginkgo.succinct -timeout 15m
go test -v github.com/openshift/odo/tests/e2e --ginkgo.focus="odoCmpE2e" -ginkgo.succinct -timeout 15m
endif

# Run component subcommands e2e tests
.PHONY: test-cmp-sub-e2e
test-cmp-sub-e2e:
ifdef TIMEOUT
go test -v github.com/redhat-developer/odo/tests/e2e --ginkgo.focus="odoCmpSubE2e" -ginkgo.succinct -timeout $(TIMEOUT)
go test -v github.com/openshift/odo/tests/e2e --ginkgo.focus="odoCmpSubE2e" -ginkgo.succinct -timeout $(TIMEOUT)
else
go test -v github.com/redhat-developer/odo/tests/e2e --ginkgo.focus="odoCmpSubE2e" -ginkgo.succinct -timeout 15m
go test -v github.com/openshift/odo/tests/e2e --ginkgo.focus="odoCmpSubE2e" -ginkgo.succinct -timeout 15m
endif

# Run java e2e tests
.PHONY: test-java-e2e
test-java-e2e:
ifdef TIMEOUT
go test -v github.com/redhat-developer/odo/tests/e2e --ginkgo.focus="odoJavaE2e" -ginkgo.succinct -timeout $(TIMEOUT)
go test -v github.com/openshift/odo/tests/e2e --ginkgo.focus="odoJavaE2e" -ginkgo.succinct -timeout $(TIMEOUT)
else
go test -v github.com/redhat-developer/odo/tests/e2e --ginkgo.focus="odoJavaE2e" -ginkgo.succinct
go test -v github.com/openshift/odo/tests/e2e --ginkgo.focus="odoJavaE2e" -ginkgo.succinct
endif

# Run source e2e tests
.PHONY: test-source-e2e
test-source-e2e:
ifdef TIMEOUT
go test -v github.com/redhat-developer/odo/tests/e2e --ginkgo.focus="odoSourceE2e" -ginkgo.succinct -timeout $(TIMEOUT)
go test -v github.com/openshift/odo/tests/e2e --ginkgo.focus="odoSourceE2e" -ginkgo.succinct -timeout $(TIMEOUT)
else
go test -v github.com/redhat-developer/odo/tests/e2e --ginkgo.focus="odoSourceE2e" -ginkgo.succinct
go test -v github.com/openshift/odo/tests/e2e --ginkgo.focus="odoSourceE2e" -ginkgo.succinct
endif

# Run service catalog e2e tests
.PHONY: test-service-e2e
test-service-e2e:
ifdef TIMEOUT
go test -v github.com/redhat-developer/odo/tests/e2e --ginkgo.focus="odoServiceE2e" -ginkgo.succinct -timeout $(TIMEOUT)
go test -v github.com/openshift/odo/tests/e2e --ginkgo.focus="odoServiceE2e" -ginkgo.succinct -timeout $(TIMEOUT)
else
go test -v github.com/redhat-developer/odo/tests/e2e --ginkgo.focus="odoServiceE2e" -ginkgo.succinct
go test -v github.com/openshift/odo/tests/e2e --ginkgo.focus="odoServiceE2e" -ginkgo.succinct
endif

# Run link e2e tests
.PHONY: test-link-e2e
test-link-e2e:
ifdef TIMEOUT
go test -v github.com/redhat-developer/odo/tests/e2e --ginkgo.focus="odoLinkE2e" -ginkgo.succinct -timeout $(TIMEOUT)
go test -v github.com/openshift/odo/tests/e2e --ginkgo.focus="odoLinkE2e" -ginkgo.succinct -timeout $(TIMEOUT)
else
go test -v github.com/redhat-developer/odo/tests/e2e --ginkgo.focus="odoLinkE2e" -ginkgo.succinct
go test -v github.com/openshift/odo/tests/e2e --ginkgo.focus="odoLinkE2e" -ginkgo.succinct
endif

# Run link e2e tests
.PHONY: test-watch-e2e
test-watch-e2e:
ifdef TIMEOUT
go test -v github.com/redhat-developer/odo/tests/e2e --ginkgo.focus="odoWatchE2e" -ginkgo.succinct -timeout $(TIMEOUT)
go test -v github.com/openshift/odo/tests/e2e --ginkgo.focus="odoWatchE2e" -ginkgo.succinct -timeout $(TIMEOUT)
else
go test -v github.com/redhat-developer/odo/tests/e2e --ginkgo.focus="odoWatchE2e" -ginkgo.succinct
go test -v github.com/openshift/odo/tests/e2e --ginkgo.focus="odoWatchE2e" -ginkgo.succinct
endif

# Run login e2e tests
.PHONY: test-odo-login-e2e
test-odo-login-e2e:
ifdef TIMEOUT
go test -v github.com/redhat-developer/odo/tests/e2e --ginkgo.focus="odoLoginE2e" -ginkgo.succinct -timeout $(TIMEOUT)
go test -v github.com/openshift/odo/tests/e2e --ginkgo.focus="odoLoginE2e" -ginkgo.succinct -timeout $(TIMEOUT)
else
go test -v github.com/redhat-developer/odo/tests/e2e --ginkgo.focus="odoLoginE2e" -ginkgo.succinct
go test -v github.com/openshift/odo/tests/e2e --ginkgo.focus="odoLoginE2e" -ginkgo.succinct
endif

# Run all e2e tests
.PHONY: test-e2e
test-e2e:
ifdef TIMEOUT
go test -v github.com/redhat-developer/odo/tests/e2e -ginkgo.succinct -timeout $(TIMEOUT)
go test -v github.com/openshift/odo/tests/e2e -ginkgo.succinct -timeout $(TIMEOUT)
else
go test -v github.com/redhat-developer/odo/tests/e2e -ginkgo.succinct
go test -v github.com/openshift/odo/tests/e2e -ginkgo.succinct
endif

# create deb and rpm packages using fpm in ./dist/pkgs/

0 comments on commit 6bd0d73

Please sign in to comment.
You can’t perform that action at this time.