diff --git a/ci/tasks/build-docker-args.sh b/ci/tasks/build-docker-args.sh index beeb9ea540..9e7da2b8b9 100755 --- a/ci/tasks/build-docker-args.sh +++ b/ci/tasks/build-docker-args.sh @@ -28,7 +28,7 @@ yq_cli_url="$(curl -s https://api.github.com/repos/mikefarah/yq/releases/latest ruby_install_url="$(curl -s https://api.github.com/repos/postmodern/ruby-install/releases/latest \ | jq -r '.assets[] | select(.name | endswith ("tar.gz")) | .browser_download_url')" -ruby_version="$(cat "${REPO_ROOT}/.ruby-version")" +ruby_version="$(cat "${REPO_PARENT}/bosh-linux-stemcell-builder/.ruby-version")" gem_home="/usr/local/bundle" cat << EOF > "${REPO_PARENT}/docker-build-args/docker-build-args.json" diff --git a/ci/tasks/build-release-metadata.sh b/ci/tasks/build-release-metadata.sh index e9e5d08600..5ef9a4049d 100755 --- a/ci/tasks/build-release-metadata.sh +++ b/ci/tasks/build-release-metadata.sh @@ -36,7 +36,7 @@ pushd "${REPO_PARENT}/candidate-stemcell" kernel_version=$(grep "${KERNEL_PACKAGE}" packages.txt | awk '{print $3}') popd -bosh_agent_version=$(cat "${REPO_ROOT}/stemcell_builder/stages/bosh_go_agent/assets/bosh-agent-version") +bosh_agent_version=$(cat "${REPO_PARENT}/bosh-linux-stemcell-builder/stemcell_builder/stages/bosh_go_agent/assets/bosh-agent-version") { echo "## Metadata:" echo "**BOSH Agent Version**: ${bosh_agent_version}" @@ -45,9 +45,9 @@ bosh_agent_version=$(cat "${REPO_ROOT}/stemcell_builder/stages/bosh_go_agent/ass if [[ "${OS_NAME}" == "ubuntu" ]]; then # Ensure URL for usn-log from metalink exists before attempting to download. - usn_log_json_file="${REPO_ROOT}/usn-log.json" + usn_log_json_file="${REPO_PARENT}/bosh-linux-stemcell-builder/usn-log.json" touch "${usn_log_json_file}" - usn_metalink_path="${REPO_ROOT}/bosh-stemcell/image-metalinks/${BRANCH}/${OS_NAME}-${OS_VERSION}.meta4" + usn_metalink_path="${REPO_PARENT}/bosh-linux-stemcell-builder/bosh-stemcell/image-metalinks/${BRANCH}/${OS_NAME}-${OS_VERSION}.meta4" if [[ -n "$(meta4 file-urls --metalink "${usn_metalink_path}" --file usn-log.json)" ]]; then meta4 file-download \ --skip-hash-verification \ diff --git a/ci/tasks/build.sh b/ci/tasks/build.sh index 00c34a73d8..a068d6a8f6 100755 --- a/ci/tasks/build.sh +++ b/ci/tasks/build.sh @@ -71,7 +71,8 @@ for i in $(seq 0 64); do fi done -chown -R ubuntu:ubuntu "${REPO_ROOT}" +chown -R ubuntu:ubuntu "${REPO_ROOT}" # ci resource +chown -R ubuntu:ubuntu "${REPO_PARENT}/bosh-linux-stemcell-builder" chown -R ubuntu:ubuntu /mnt OS_IMAGE="" @@ -84,7 +85,7 @@ sudo chmod u+s "$(which sudo)" sudo --preserve-env --set-home --user ubuntu -- /bin/bash --login -i <&2 exit 1 @@ -116,14 +117,14 @@ fi if [ -e "${raw_images[0]}" ] ; then # openstack currently publishes raw files raw_stemcell_filename="${stemcell_name}-raw.tgz" - mv "${REPO_ROOT}/tmp"/*-raw.tgz "${REPO_PARENT}/stemcell/${raw_stemcell_filename}" + mv "${REPO_PARENT}/bosh-linux-stemcell-builder/tmp"/*-raw.tgz "${REPO_PARENT}/stemcell/${raw_stemcell_filename}" meta4 import-file --metalink="$meta4_path" --version="${CANDIDATE_BUILD_NUMBER}" "${REPO_PARENT}/stemcell/${raw_stemcell_filename}" meta4 file-set-url --metalink="$meta4_path" --file="${raw_stemcell_filename}" "https://${S3_API_ENDPOINT}/${STEMCELL_BUCKET}/${IAAS}/${raw_stemcell_filename}" fi stemcell_filename="${stemcell_name}.tgz" -mv "${REPO_ROOT}/tmp/${stemcell_filename}" "${REPO_PARENT}/stemcell/${stemcell_filename}" +mv "${REPO_PARENT}/bosh-linux-stemcell-builder/tmp/${stemcell_filename}" "${REPO_PARENT}/stemcell/${stemcell_filename}" meta4 import-file --metalink="$meta4_path" --version="${CANDIDATE_BUILD_NUMBER}" "${REPO_PARENT}/stemcell/${stemcell_filename}" meta4 file-set-url --metalink="$meta4_path" --file="${stemcell_filename}" "https://${S3_API_ENDPOINT}/${STEMCELL_BUCKET}/${IAAS}/${stemcell_filename}" diff --git a/ci/tasks/bump-bosh-agent.sh b/ci/tasks/bump-bosh-agent.sh index ecf8fa91bc..222828b5b7 100755 --- a/ci/tasks/bump-bosh-agent.sh +++ b/ci/tasks/bump-bosh-agent.sh @@ -10,12 +10,15 @@ if [[ -n "${DEBUG:-}" ]]; then export BOSH_LOG_PATH="${BOSH_LOG_PATH:-${REPO_PARENT}/bosh-debug.log}" fi -git clone "${REPO_ROOT}" "${REPO_PARENT}/bosh-linux-stemcell-builder-out" +git clone "${REPO_PARENT}/bosh-linux-stemcell-builder" \ + "${REPO_PARENT}/bosh-linux-stemcell-builder-out" version=$( cat "${REPO_PARENT}/bosh-agent/.resource/version" ) -cp "${REPO_PARENT}/bosh-agent/.resource/metalink.meta4" "${REPO_PARENT}/bosh-linux-stemcell-builder-out/stemcell_builder/stages/bosh_go_agent/assets/" -cp "${REPO_PARENT}/bosh-agent/.resource/version" "${REPO_PARENT}/bosh-linux-stemcell-builder-out/stemcell_builder/stages/bosh_go_agent/assets/bosh-agent-version" +cp "${REPO_PARENT}/bosh-agent/.resource/metalink.meta4" \ + "${REPO_PARENT}/bosh-linux-stemcell-builder-out/stemcell_builder/stages/bosh_go_agent/assets/" +cp "${REPO_PARENT}/bosh-agent/.resource/version" \ + "${REPO_PARENT}/bosh-linux-stemcell-builder-out/stemcell_builder/stages/bosh_go_agent/assets/bosh-agent-version" pushd "${REPO_PARENT}/bosh-linux-stemcell-builder-out" if [ "$(git status --porcelain)" != "" ]; then diff --git a/ci/tasks/bump-bosh-blobstore-cli.sh b/ci/tasks/bump-bosh-blobstore-cli.sh index e37bfb6c51..f82d23ca1a 100755 --- a/ci/tasks/bump-bosh-blobstore-cli.sh +++ b/ci/tasks/bump-bosh-blobstore-cli.sh @@ -10,7 +10,7 @@ if [[ -n "${DEBUG:-}" ]]; then export BOSH_LOG_PATH="${BOSH_LOG_PATH:-${REPO_PARENT}/bosh-debug.log}" fi -git clone "${REPO_ROOT}" "${REPO_PARENT}/bosh-linux-stemcell-builder-out" +git clone "${REPO_PARENT}/bosh-linux-stemcell-builder" "${REPO_PARENT}/bosh-linux-stemcell-builder-out" url=$(cat "${REPO_PARENT}/bosh-blobstore-cli/url") version=$(cat "${REPO_PARENT}/bosh-blobstore-cli/version") diff --git a/ci/tasks/commit-build-time.sh b/ci/tasks/commit-build-time.sh index e1850726c3..3d8688a1b9 100755 --- a/ci/tasks/commit-build-time.sh +++ b/ci/tasks/commit-build-time.sh @@ -13,7 +13,7 @@ fi build_time="$(cat "${REPO_PARENT}/build-time/timestamp")" formatted_build_time="$(date --date "${build_time%.*}" +%Y%m%dT%H%M%SZ)" -pushd "${REPO_ROOT}" +pushd "${REPO_PARENT}/bosh-linux-stemcell-builder" echo "${formatted_build_time}" > build_time.txt git add -A git config --global user.email "ci@localhost" diff --git a/ci/tasks/os-images/build.sh b/ci/tasks/os-images/build.sh index ce6af26d0c..41d606ee8e 100755 --- a/ci/tasks/os-images/build.sh +++ b/ci/tasks/os-images/build.sh @@ -35,7 +35,7 @@ sudo chmod u+s "$(which sudo)" sudo --preserve-env --set-home --user ubuntu -- /bin/bash --login -i <