Reduce verbosity of docker build, gofmt and uncommenting helm uninstall

This commit is contained in:
smruthi2187
2018-02-08 13:58:44 -08:00
parent 266922da26
commit 818876dd08
6 changed files with 36 additions and 36 deletions
+2 -2
View File
@@ -18,10 +18,10 @@ package controller
import ( import (
"log" "log"
"os/signal"
"syscall"
"os" "os"
"os/signal"
"runtime/debug" "runtime/debug"
"syscall"
"github.com/fission/fission/crd" "github.com/fission/fission/crd"
) )
+3 -3
View File
@@ -10,11 +10,11 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"os" "os"
"strconv"
"time"
"os/signal" "os/signal"
"syscall"
"runtime/debug" "runtime/debug"
"strconv"
"syscall"
"time"
"github.com/fission/fission" "github.com/fission/fission"
"github.com/fission/fission/environments/fetcher" "github.com/fission/fission/environments/fetcher"
+4 -4
View File
@@ -18,13 +18,13 @@ package executor
import ( import (
"log" "log"
"strings"
"sync"
"time"
"os" "os"
"os/signal" "os/signal"
"syscall"
"runtime/debug" "runtime/debug"
"strings"
"sync"
"syscall"
"time"
"github.com/dchest/uniuri" "github.com/dchest/uniuri"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+2 -2
View File
@@ -45,10 +45,10 @@ import (
"log" "log"
"net/http" "net/http"
"os" "os"
"time"
"os/signal" "os/signal"
"syscall"
"runtime/debug" "runtime/debug"
"syscall"
"time"
"github.com/gorilla/handlers" "github.com/gorilla/handlers"
"github.com/gorilla/mux" "github.com/gorilla/mux"
+3 -3
View File
@@ -22,11 +22,11 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"os" "os"
"strconv"
"time"
"os/signal" "os/signal"
"syscall"
"runtime/debug" "runtime/debug"
"strconv"
"syscall"
"time"
"github.com/gorilla/handlers" "github.com/gorilla/handlers"
"github.com/gorilla/mux" "github.com/gorilla/mux"
+7 -7
View File
@@ -59,7 +59,7 @@ build_and_push_fission_bundle() {
pushd $ROOT/fission-bundle pushd $ROOT/fission-bundle
./build.sh ./build.sh
docker build -t $image_tag . docker build -q -t $image_tag .
gcloud_login gcloud_login
@@ -72,7 +72,7 @@ build_and_push_fetcher() {
pushd $ROOT/environments/fetcher/cmd pushd $ROOT/environments/fetcher/cmd
./build.sh ./build.sh
docker build -t $image_tag . docker build -q -t $image_tag .
gcloud_login gcloud_login
@@ -86,7 +86,7 @@ build_and_push_builder() {
pushd $ROOT/builder/cmd pushd $ROOT/builder/cmd
./build.sh ./build.sh
docker build -t $image_tag . docker build -q -t $image_tag .
gcloud_login gcloud_login
@@ -98,7 +98,7 @@ build_and_push_fluentd(){
image_tag=$1 image_tag=$1
pushd $ROOT/logger/fluentd pushd $ROOT/logger/fluentd
docker build -t $image_tag . docker build -q -t $image_tag .
gcloud_login gcloud_login
@@ -112,7 +112,7 @@ build_and_push_env_runtime() {
image_tag=$2 image_tag=$2
pushd $ROOT/environments/$env/ pushd $ROOT/environments/$env/
docker build -t $image_tag . docker build -q -t $image_tag .
gcloud_login gcloud_login
@@ -127,7 +127,7 @@ build_and_push_env_builder() {
pushd $ROOT/environments/$env/builder pushd $ROOT/environments/$env/builder
docker build -t $image_tag --build-arg BUILDER_IMAGE=${builder_image} . docker build -q -t $image_tag --build-arg BUILDER_IMAGE=${builder_image} .
gcloud_login gcloud_login
@@ -461,7 +461,7 @@ install_and_test() {
clean_tpr_crd_resources clean_tpr_crd_resources
id=$(generate_test_id) id=$(generate_test_id)
#trap "helm_uninstall_fission $id" EXIT trap "helm_uninstall_fission $id" EXIT
if ! helm_install_fission $id $image $imageTag $fetcherImage $fetcherImageTag $controllerPort $routerPort $fluentdImage $fluentdImageTag $pruneInterval if ! helm_install_fission $id $image $imageTag $fetcherImage $fetcherImageTag $controllerPort $routerPort $fluentdImage $fluentdImageTag $pruneInterval
then then
describe_all_pods $id describe_all_pods $id