From mboxrd@z Thu Jan  1 00:00:00 1970
Received: by passt.top (Postfix, from userid 1000)
	id 2D56D5A0267; Wed, 26 Oct 2022 07:12:11 +0200 (CEST)
From: Stefano Brivio <sbrivio@redhat.com>
To: passt-dev@passt.top
Subject: [PATCH] hooks: Temporarily disable demo generation in pre-push
Date: Wed, 26 Oct 2022 07:12:11 +0200
Message-Id: <20221026051211.1842082-1-sbrivio@redhat.com>
X-Mailer: git-send-email 2.35.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Message-ID-Hash: 4BIMWLNTYV52JWJ2W6L6477NNUOU4AUA
X-Message-ID-Hash: 4BIMWLNTYV52JWJ2W6L6477NNUOU4AUA
X-MailFrom: sbrivio@passt.top
X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header
X-Mailman-Version: 3.3.3
Precedence: list
List-Id: Development discussion and patches for passt <passt-dev.passt.top>
Archived-At: <>
Archived-At: <https://archives.passt.top/passt-dev/20221026051211.1842082-1-sbrivio@redhat.com/>
List-Archive: <>
List-Archive: <https://archives.passt.top/passt-dev/>
List-Help: <mailto:passt-dev-request@passt.top?subject=help>
List-Owner: <mailto:passt-dev-owner@passt.top>
List-Post: <mailto:passt-dev@passt.top>
List-Subscribe: <mailto:passt-dev-join@passt.top>
List-Unsubscribe: <mailto:passt-dev-leave@passt.top>

The out-of-tree Podman patch needs to be rebased every second week or
so, and I'm currently trying to get that upstream:
  https://github.com/containers/podman/pull/16141

Disable demo generation for the moment, so that I avoid wasting time
with those rebases. We'll re-enable it later.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
---
 hooks/pre-push | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/hooks/pre-push b/hooks/pre-push
index ebca1f6..89717e7 100755
--- a/hooks/pre-push
+++ b/hooks/pre-push
@@ -21,13 +21,13 @@ BASE="/var/www/passt"
 BUILDS="${BASE}/builds"
 LATEST="${BUILDS}/latest"
 TEMP="${BUILDS}/temp"
-AWAY="${BUILDS}/away"
 
 WEB="${TEMP}/web"
 TEST="${TEMP}/test"
 
 ARCH="$(uname -m)"
 BIN="${TEMP}/${ARCH}"
+OLD_BIN="${LATEST}/${ARCH}"
 
 ssh "${USER_HOST}" 				"mkdir -p ${WEB} ${TEST} ${BIN}"
 
@@ -41,12 +41,15 @@ for f in test_logs/web/*.cast test_logs/web/*.js; do
 	scp "${f}.gz"			 	"${USER_HOST}:${WEB}/"
 done
 
+# TODO: Re-enable demos once we have pasta support in upstream Podman
+skip() {
 ./run_demo
 for f in test_logs/web/*.cast test_logs/web/*.js; do
 	gzip -fk9 "${f}"
 	scp "${f}"			 	"${USER_HOST}:${WEB}/"
 	scp "${f}.gz"			 	"${USER_HOST}:${WEB}/"
 done
+}
 
 cd ..
 
@@ -68,6 +71,10 @@ for pic in passt_overview pasta_overview; do
 done
 scp doc/*.html					"${USER_HOST}:${WEB}/"
 
-ssh "${USER_HOST}"				"mv ${LATEST} ${AWAY}"
-ssh "${USER_HOST}"				"mv ${TEMP} ${LATEST}"
-ssh "${USER_HOST}"				"rm -rf ${AWAY}"
+ssh "${USER_HOST}"				"cp ${WEB}/* ${LATEST}/web/"
+ssh "${USER_HOST}"				"cp ${TEST}/* ${LATEST}/test/"
+
+ssh "${USER_HOST}" 				"rm -f ${OLD_BIN}/*"
+ssh "${USER_HOST}"				"cp ${BIN}/* ${LATEST}/${ARCH}/"
+
+ssh "${USER_HOST}"				"rm -rf ${TEMP}"
-- 
2.35.1