From ad8fffcec733ecb18a172307ca28c5398639b006 Mon Sep 17 00:00:00 2001 From: Petr Nyc Date: Wed, 23 Apr 2025 18:44:08 +0200 Subject: [PATCH] 23.4.2025 Wednesday 18:44 --- .ssh/config.solaris | 11 +++++++++++ bin/lib/logging.sh | 2 +- bin/ul11u4_gate_open.sh | 8 ++++++-- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.ssh/config.solaris b/.ssh/config.solaris index 792e782..39769f1 100644 --- a/.ssh/config.solaris +++ b/.ssh/config.solaris @@ -15,11 +15,22 @@ Host * Host 192.168.2.* IdentitiesOnly yes +Host hetzner + HostName u444067.your-storagebox.de + User u444067 + Port 23 + IdentityFile ~/.ssh/id_hetzner + Host osdbld HostName 100.73.219.187 User opc IdentityFile ~/.ssh/id_nginxbuild +Host nginx-osd-dev + Hostname 100.106.197.175 + User opc + IdentityFile ~/.ssh/osd-dev-pnyc + Host osd-calico-dev osd-calico-dev.webad1phx.solarisx86phx.oraclevcn.com Hostname osd-calico-dev.webad1phx.solarisx86phx.oraclevcn.com User opc diff --git a/bin/lib/logging.sh b/bin/lib/logging.sh index 4b6369f..811a064 100644 --- a/bin/lib/logging.sh +++ b/bin/lib/logging.sh @@ -8,7 +8,7 @@ trap 'exit 1' HUP INT QUIT TERM trap 'on_error' EXIT log::prefix() { - date=$(gdate '+%Y-%m-%d %H:%M:%S,%3N') + date=$(/opt/homebrew/bin/gdate '+%Y-%m-%d %H:%M:%S,%3N') printf '%s %s\n' "${date}" "${*}" } diff --git a/bin/ul11u4_gate_open.sh b/bin/ul11u4_gate_open.sh index 1057d5d..e1b512f 100755 --- a/bin/ul11u4_gate_open.sh +++ b/bin/ul11u4_gate_open.sh @@ -5,13 +5,17 @@ BINDIR=$(dirname "$PRG") typeset -r BINDIR +W3M=/opt/homebrew/bin/w3m +AWK=/usr/bin/awk +CURL=/usr/bin/curl + source "${BINDIR}/lib/logging.sh" TARGET="${1-11.4.81.0.1.195.1}" URL="http://grt.us.oracle.com/grt/webservice/grtList/?gate=20&show=All&gateName=S11.4-SRU&status=1&target=${TARGET}" -out=$(w3m "$URL" -M -cols 400 -graph -dump | awk '/^Details/ {found=1; next} found && NF') +out=$($W3M "$URL" -M -cols 400 -graph -dump | $AWK '/^Details/ {found=1; next} found && NF') if [[ -z "$out" ]]; then @@ -32,7 +36,7 @@ JOB_URL="${JENKINS_SERVER}/job/Solaris_11/job/11.4/job/userland-sru/job/userland log::info "Using '${JOB_URL}'" -curl -X POST "${JOB_URL}" \ +$CURL -X POST "${JOB_URL}" \ --user "pnyc:${JENKINS_TOKEN}" \ --data-urlencode "Build_Label=${TARGET}" \ --data-urlencode "hguser=petr.nyc@oracle.com" \