moved scripts one folder up

containers/build_deploy.sh

@@ -16,14 +16,15 @@
 set -eux
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-ROOT_DIR="$(dirname $(dirname ${DIR}))"
+ROOT_DIR="$(dirname ${DIR})"
 
 # get config options
 source "${ROOT_DIR}/k8s_config"
 
-IMAGE_NAME="agent-debian-testing-clang8"
+IMAGE_NAME="$1"
 QUALIFIED_NAME="${GCR_HOSTNAME}/${GCP_PROJECT}/${IMAGE_NAME}"
 
+cd "${DIR}/${IMAGE_NAME}"
 docker build -t ${IMAGE_NAME} .
 docker tag ${IMAGE_NAME} ${QUALIFIED_NAME}
 docker push ${QUALIFIED_NAME} 

containers/build_run.sh

@@ -14,8 +14,10 @@
 # limitations under the License.
 
 set -eux
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-IMAGE_NAME="agent-debian-testing-clang8"
+IMAGE_NAME="$1"
 
+cd "${DIR}/${IMAGE_NAME}"
 docker build -t ${IMAGE_NAME} .
 docker run -i -t ${IMAGE_NAME}

containers/jenkins-master/build_deploy.sh

@@ -1,31 +0,0 @@
-#!/bin/bash
-# Copyright 2019 Google LLC
-#
-# Licensed under the the Apache License v2.0 with LLVM Exceptions (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://llvm.org/LICENSE.txt
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -eux
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-ROOT_DIR="$(dirname $(dirname ${DIR}))"
-
-# get config options
-source "${ROOT_DIR}/k8s_config"
-
-IMAGE_NAME="jenkins-master"
-QUALIFIED_NAME="${GCR_HOSTNAME}/${GCP_PROJECT}/${IMAGE_NAME}"
-
-docker build -t ${IMAGE_NAME} .
-docker tag ${IMAGE_NAME} ${QUALIFIED_NAME}
-docker push ${QUALIFIED_NAME}
-
-echo "Deployed as ${QUALIFIED_NAME}."