Merge pull request #4640 from smarterclayton/simplify_release

Merged by openshift-bot

Author: OpenShift Bot

hack/build-release.sh

@@ -39,12 +39,3 @@ gzip -f "${context}/archive.tar"
 cat "${context}/archive.tar.gz" | docker run -i --cidfile="${context}/cid" openshift/origin-release
 docker cp $(cat ${context}/cid):/go/src/github.com/openshift/origin/_output/local/releases "${OS_OUTPUT}"
 echo "${OS_GIT_COMMIT}" > "${OS_LOCAL_RELEASEPATH}/.commit"
-
-# Copy the linux release archives release back to the local _output/local/go/bin directory.
-os::build::detect_local_release_tars "linux"
-
-mkdir -p "${OS_LOCAL_BINPATH}"
-tar mxzf "${OS_PRIMARY_RELEASE_TAR}" -C "${OS_LOCAL_BINPATH}"
-tar mxzf "${OS_IMAGE_RELEASE_TAR}" -C "${OS_LOCAL_BINPATH}"
-
-os::build::make_openshift_binary_symlinks

hack/common.sh

@@ -75,6 +75,18 @@ readonly OPENSHIFT_BINARY_SYMLINKS=(
 )
 readonly OPENSHIFT_BINARY_COPY=(
   oadm
+  kubelet
+  kube-proxy
+  kube-apiserver
+  kube-controller-manager
+  kube-scheduler
+)
+readonly OC_BINARY_COPY=(
+  kubectl
+)
+readonly OS_BINARY_RELEASE_WINDOWS=(
+  oc.exe
+  kubectl.exe
 )
 
 # os::build::binaries_from_targets take a list of build targets and return the
@@ -316,16 +328,29 @@ os::build::place_bins() {
       for linkname in "${OPENSHIFT_BINARY_COPY[@]}"; do
         local src="${release_binpath}/openshift${suffix}"
         if [[ -f "${src}" ]]; then
-          cp "${release_binpath}/openshift${suffix}" "${release_binpath}/${linkname}${suffix}"
+          ln "${release_binpath}/openshift${suffix}" "${release_binpath}/${linkname}${suffix}"
+        fi
+      done
+      for linkname in "${OC_BINARY_COPY[@]}"; do
+        local src="${release_binpath}/oc${suffix}"
+        if [[ -f "${src}" ]]; then
+          ln "${release_binpath}/oc${suffix}" "${release_binpath}/${linkname}${suffix}"
         fi
       done
 
       # Create the release archive.
       local platform_segment="${platform//\//-}"
-      local archive_name="${OS_RELEASE_ARCHIVE}-${OS_GIT_VERSION}-${OS_GIT_COMMIT}-${platform_segment}.tar.gz"
-
-      echo "++ Creating ${archive_name}"
-      tar -czf "${OS_LOCAL_RELEASEPATH}/${archive_name}" -C "${release_binpath}" .
+      if [[ $platform == "windows/amd64" ]]; then
+        local archive_name="${OS_RELEASE_ARCHIVE}-${OS_GIT_VERSION}-${OS_GIT_COMMIT}-${platform_segment}.zip"
+        echo "++ Creating ${archive_name}"
+        for file in "${OS_BINARY_RELEASE_WINDOWS[@]}"; do
+          zip "${OS_LOCAL_RELEASEPATH}/${archive_name}" -qj "${release_binpath}/${file}"
+        done
+      else
+        local archive_name="${OS_RELEASE_ARCHIVE}-${OS_GIT_VERSION}-${OS_GIT_COMMIT}-${platform_segment}.tar.gz"
+        echo "++ Creating ${archive_name}"
+        tar -czf "${OS_LOCAL_RELEASEPATH}/${archive_name}" -C "${release_binpath}" .
+      fi
       rm -rf "${release_binpath}"
     done
   )