Browse code

set the --clientset-api-path=/oapi for origin clients

Michal Fojtik authored on 2016/09/15 19:30:40
Showing 2 changed files
... ...
@@ -21,8 +21,6 @@ fi
21 21
 os::build::get_version_vars
22 22
 origin_version="v${OS_GIT_MAJOR}_${OS_GIT_MINOR%+}"
23 23
 
24
-exit 0
25
-
26 24
 packages=(
27 25
   github.com/openshift/origin/pkg/authorization
28 26
   github.com/openshift/origin/pkg/build
... ...
@@ -44,6 +42,7 @@ function generate_clientset_for() {
44 44
   pushd ${OS_ROOT} >/dev/null
45 45
   local common_args="--go-header-file=hack/boilerplate.txt"
46 46
   $clientgen --clientset-path="${package}/client/clientset_generated" \
47
+             --clientset-api-path="/oapi"                             \
47 48
              --input-base="${package}/api"                            \
48 49
              --output-base="../../.."                                 \
49 50
              --clientset-name="${name}"                               \
... ...
@@ -2,7 +2,7 @@
2 2
 source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
3 3
 
4 4
 echo "===== Verifying Generated Client sets ====="
5
-output=$(VERIFY=true ${OS_ROOT}/hack/update-generated-clientsets.sh 2>&1)
5
+output=$(VERIFY=true ${OS_ROOT}/hack/update-generated-clientsets.sh)
6 6
 
7 7
 if [[ "$?" == "0" ]]; then
8 8
   echo "SUCCESS: Generated client sets up to date."