X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgerrit-ciman-packer-merge-ubuntu1604-java-builder;h=9a1fd38a7d6b4e21c73ce488b727ad7bd7bb26d3;hb=refs%2Fchanges%2F47%2F8347%2F3;hp=27b47a3ceaf7018aa252caa7e8cacdbabb0cd454;hpb=6df0d5a717c1e3c33aae618b80382b491476cd54;p=releng%2Fglobal-jjb.git diff --git a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder index 27b47a3c..9a1fd38a 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder +++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder @@ -76,7 +76,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. PACKER_VERSION Packer version to download and install. - 1.0.2 + 1.1.3 @@ -151,7 +151,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. ANT - packer/provision/java-builder.sh + packer/provision/*.sh + + + ANT + packer/provision/java-builder.yaml ANT @@ -205,7 +209,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. - PACKER_VERSION=1.0.2 + PACKER_VERSION=1.1.3 @@ -226,7 +230,7 @@ echo "---> packer-install.sh" # $PACKER_VERSION : Define a packer version passed as job paramter -PACKER_VERSION="${PACKER_VERSION:-1.0.2}" +PACKER_VERSION="${PACKER_VERSION:-1.1.3}" # Ensure we fail the job if any steps fail. set -eu -o pipefail @@ -236,12 +240,12 @@ if hash packer.io 2>/dev/null; then else echo "packer.io command not is available. Installing packer ..." # Installs Hashicorp's Packer binary, required for verify & merge packer jobs - pushd packer + pushd "${WORKSPACE}" wget -nv "https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip" mkdir -p "${WORKSPACE}/bin" - unzip "packer_${PACKER_VERSION}_linux_amd64.zip" -d ${WORKSPACE}/bin/ + unzip "packer_${PACKER_VERSION}_linux_amd64.zip" -d "${WORKSPACE}/bin/" # rename packer to avoid conflict with binary in cracklib - mv ${WORKSPACE}/bin/packer "${WORKSPACE}/bin/packer.io" + mv "${WORKSPACE}/bin/packer" "${WORKSPACE}/bin/packer.io" popd fi @@ -268,17 +272,25 @@ mkdir -p "$PACKER_LOGS_DIR" export PATH="${WORKSPACE}/bin:$PATH" cd packer -varfiles=(../packer/vars/*.json) -templates=(../packer/templates/*.json) +varfiles=(vars/*.json common-packer/vars/*.json) +templates=(templates/*.json) for varfile in "${varfiles[@]}"; do + # cloud-env.json is a file containing credentials which is pulled in via + # CLOUDENV variable so skip it here. + if [[ "$varfile" == *"cloud-env.json"* ]]; then + continue + fi + + echo "-----> Testing varfile: $varfile" for template in "${templates[@]}"; do - export PACKER_LOG="yes" && \ - export PACKER_LOG_PATH="$PACKER_LOGS_DIR/packer-validate-${varfile##*/}-${template##*/}.log" && \ - packer.io validate -var-file="$CLOUDENV" \ - -var-file="$varfile" "$template" - if [ $? -ne 0 ]; then - break + export PACKER_LOG="yes" + export PACKER_LOG_PATH="$PACKER_LOGS_DIR/packer-validate-${varfile##*/}-${template##*/}.log" + if output=$(packer.io validate -var-file="$CLOUDENV" -var-file="$varfile" "$template"); then + echo "$template: $output" + else + echo "$template: $output" + exit 1 fi done done @@ -315,7 +327,7 @@ exit 0 PACKER_PLATFORM=ubuntu1604 PACKER_TEMPLATE=java-builder -PACKER_VERSION=1.0.2 +PACKER_VERSION=1.1.3 @@ -336,7 +348,7 @@ echo "---> packer-install.sh" # $PACKER_VERSION : Define a packer version passed as job paramter -PACKER_VERSION="${PACKER_VERSION:-1.0.2}" +PACKER_VERSION="${PACKER_VERSION:-1.1.3}" # Ensure we fail the job if any steps fail. set -eu -o pipefail @@ -346,12 +358,12 @@ if hash packer.io 2>/dev/null; then else echo "packer.io command not is available. Installing packer ..." # Installs Hashicorp's Packer binary, required for verify & merge packer jobs - pushd packer + pushd "${WORKSPACE}" wget -nv "https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip" mkdir -p "${WORKSPACE}/bin" - unzip "packer_${PACKER_VERSION}_linux_amd64.zip" -d ${WORKSPACE}/bin/ + unzip "packer_${PACKER_VERSION}_linux_amd64.zip" -d "${WORKSPACE}/bin/" # rename packer to avoid conflict with binary in cracklib - mv ${WORKSPACE}/bin/packer "${WORKSPACE}/bin/packer.io" + mv "${WORKSPACE}/bin/packer" "${WORKSPACE}/bin/packer.io" popd fi @@ -379,16 +391,22 @@ PACKER_BUILD_LOG="$PACKER_LOGS_DIR/packer-build.log" mkdir -p "$PACKER_LOGS_DIR" export PATH="${WORKSPACE}/bin:$PATH" +# Prioritize the project's own version of vars if available +platform_file="vars/$PACKER_PLATFORM.json" +if [ -f "$PACKER_PLATFORM" ]; then + platform_file="vars/$PACKER_PLATFORM.json" +fi + cd packer -export PACKER_LOG="yes" && \ -export PACKER_LOG_PATH="$PACKER_BUILD_LOG" && \ - packer.io build -color=false \ - -var-file="$CLOUDENV" \ - -var-file="../packer/vars/$PACKER_PLATFORM.json" \ - "../packer/templates/$PACKER_TEMPLATE.json" +export PACKER_LOG="yes" +export PACKER_LOG_PATH="$PACKER_BUILD_LOG" +packer.io build -color=false \ + -var-file="$CLOUDENV" \ + -var-file="$platform_file" \ + "templates/$PACKER_TEMPLATE.json" # Retrive the list of cloud providers -clouds=($(jq -r '.builders[].name' "../packer/templates/$PACKER_TEMPLATE.json")) +mapfile -t clouds < <(jq -r '.builders[].name' "templates/$PACKER_TEMPLATE.json") # Split public/private clouds logs for cloud in "${clouds[@]}"; do @@ -455,9 +473,9 @@ SAR_DIR="$WORKSPACE/archives/sar-reports" mkdir -p "$SAR_DIR" cp "$SYSSTAT_PATH/"* "$_" # convert sar data to ascii format -while IFS="" read -r s +while IFS="" read -r sarfilenum do - [ -f "$s" ] && LC_TIME=POSIX sar -A -f "$s" > "$SAR_DIR/sar${s//[!0-9]/}" + [ -f "$sarfilenum" ] && LC_TIME=POSIX sar -A -f "$sarfilenum" > "$SAR_DIR/sar${sarfilenum//[!0-9]/}" done < <(find "$SYSSTAT_PATH" -name "sa[0-9]*" || true) # DON'T fail build if script fails. @@ -504,7 +522,7 @@ machine=$(echo "$NEXUS_URL" | awk -F/ '{print $3}') user=$(echo "$CREDENTIAL" | cut -f1 -d:) pass=$(echo "$CREDENTIAL" | cut -f2 -d:) -echo "machine $machine login $user password $pass" > ~/.netrc +echo "machine ${machine%:*} login $user password $pass" > ~/.netrc @@ -692,5 +710,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + +