osmo-trx[master]: jenkins.sh: change qemu-img default location to $HOME/qemu-i...
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/6909 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I56f314d78c0ca968b1fef9a91ecd540a7cc8fa86 Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-HasComments: No
[MERGED] osmo-trx[master]: jenkins.sh: change qemu-img default location to $HOME/qemu-i...
Harald Welte has submitted this change and it was merged.
Change subject: jenkins.sh: change qemu-img default location to $HOME/qemu-img
instead of /opt/qemu-img
..
jenkins.sh: change qemu-img default location to $HOME/qemu-img instead of
/opt/qemu-img
Change-Id: I56f314d78c0ca968b1fef9a91ecd540a7cc8fa86
---
M contrib/jenkins.sh
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Pau Espin Pedrol: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 10fc2b1..c4d786d 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -28,7 +28,7 @@
if ! $(substr "arm" "$(uname -m)") && [ "x${INSTR}" = "x--with-neon"
-o "x${INSTR}" = "x--with-neon-vfpv4" ]; then
OSMOTRX_DIR="$PWD" # we assume we are called as
contrib/jenkins.sh
-ROOTFS_PREFIX="${ROOTFS_PREFIX:-/opt}"
+ROOTFS_PREFIX="${ROOTFS_PREFIX:-$HOME}"
ROOTFS="${ROOTFS_PREFIX}/qemu-img"
mkdir -p "${ROOTFS_PREFIX}"
--
To view, visit https://gerrit.osmocom.org/6909
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I56f314d78c0ca968b1fef9a91ecd540a7cc8fa86
Gerrit-PatchSet: 2
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol
Gerrit-Reviewer: lynxis lazus
osmo-trx[master]: jenkins.sh: change qemu-img default location to $HOME/qemu-i...
Patch Set 1: Set up the jenkins node accordingly and re-trigger the jenkins job so it gets +1 verified, then we can merge. -- To view, visit https://gerrit.osmocom.org/6909 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I56f314d78c0ca968b1fef9a91ecd540a7cc8fa86 Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-HasComments: No
osmo-trx[master]: jenkins.sh: change qemu-img default location to $HOME/qemu-i...
Patch Set 1: -Code-Review well. let's merge this one, as it's better than before. -- To view, visit https://gerrit.osmocom.org/6909 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I56f314d78c0ca968b1fef9a91ecd540a7cc8fa86 Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-HasComments: No
osmo-trx[master]: jenkins.sh: change qemu-img default location to $HOME/qemu-i...
Patch Set 1: Code-Review-1 I'm not sure if this patch is the best way to address it. I want to take another look into our jenkins scripts. -- To view, visit https://gerrit.osmocom.org/6909 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I56f314d78c0ca968b1fef9a91ecd540a7cc8fa86 Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-HasComments: No
osmo-trx[master]: jenkins.sh: change qemu-img default location to $HOME/qemu-i...
Patch Set 1: > > Why? are you planning to install the qemu-img in there? Easier > than > > /opt for permission-related reasons? > > IMHO: A jenkins job shouldn't do anything outside it's own working > directory. I know this is sometimes hard. Using $HOME/qemu-img is > still not optimal, but at least it doesn't require a directory to > be created by root with special owner/group.. I was not counting on creating the qemu-arm enviornment during usual jenkins job run, but now that we move to a more automatised way to create jenkins node it must happen and it's fine for me. Since I was expecting the qemu-arm to be already there (manually set up), then the env was used mostly read-only, so no issue. But now that we are creating it, it's fine moving it to $HOME. A better way would perhaps be creating it inside $OWRKSPACE. I think the clean_worksapce script has some way to set a blacklist to not clean that specific directory inside WORKSPACE. If it's not there, could be a nice addition, but for now using $HOME seems good if it takes a lot of time to add this feature. -- To view, visit https://gerrit.osmocom.org/6909 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I56f314d78c0ca968b1fef9a91ecd540a7cc8fa86 Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-HasComments: No
osmo-trx[master]: jenkins.sh: change qemu-img default location to $HOME/qemu-i...
Patch Set 1: > Why? are you planning to install the qemu-img in there? Easier than > /opt for permission-related reasons? IMHO: A jenkins job shouldn't do anything outside it's own working directory. I know this is sometimes hard. Using $HOME/qemu-img is still not optimal, but at least it doesn't require a directory to be created by root with special owner/group.. -- To view, visit https://gerrit.osmocom.org/6909 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I56f314d78c0ca968b1fef9a91ecd540a7cc8fa86 Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-HasComments: No
osmo-trx[master]: jenkins.sh: change qemu-img default location to $HOME/qemu-i...
Patch Set 1: Code-Review+1 Why? are you planning to install the qemu-img in there? Easier than /opt for permission-related reasons? -- To view, visit https://gerrit.osmocom.org/6909 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I56f314d78c0ca968b1fef9a91ecd540a7cc8fa86 Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No
[PATCH] osmo-trx[master]: jenkins.sh: change qemu-img default location to $HOME/qemu-i...
Review at https://gerrit.osmocom.org/6909
jenkins.sh: change qemu-img default location to $HOME/qemu-img instead of
/opt/qemu-img
Change-Id: I56f314d78c0ca968b1fef9a91ecd540a7cc8fa86
---
M contrib/jenkins.sh
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/09/6909/1
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index cee709d..781e699 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -28,7 +28,7 @@
if ! $(substr "arm" "$(uname -m)") && [ "x${INSTR}" = "x--with-neon"
-o "x${INSTR}" = "x--with-neon-vfpv4" ]; then
OSMOTRX_DIR="$PWD" # we assume we are called as
contrib/jenkins.sh
-ROOTFS_PREFIX="${ROOTFS_PREFIX:-/opt}"
+ROOTFS_PREFIX="${ROOTFS_PREFIX:-$HOME}"
ROOTFS="${ROOTFS_PREFIX}/qemu-img"
mkdir -p "${ROOTFS_PREFIX}"
--
To view, visit https://gerrit.osmocom.org/6909
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I56f314d78c0ca968b1fef9a91ecd540a7cc8fa86
Gerrit-PatchSet: 1
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus
