Make scripts/package work locally

.gitignore

@@ -8,7 +8,9 @@
 /.idea
 /cmd/agent/agent
 /package/data.json
+/package/k3s-airgap-images.tar
 /package/rancher
+/package/rancher-namespace.yaml
 /package/rancher.yaml
 /package/agent
 /tests/MANIFEST

scripts/k3s-images.sh

@@ -5,6 +5,10 @@ cd $(dirname $0)/..
 
 mkdir -p bin
 
-images=$(grep -e 'docker.io/rancher/pause' -e 'docker.io/rancher/coredns-coredns' /usr/tmp/k3s-images.txt)
-xargs -n1 docker pull <<< "${images}"
-docker save -o ./bin/k3s-airgap-images.tar ${images}
+if [ -e /usr/tmp/k3s-images.txt ]; then
+    images=$(grep -e 'docker.io/rancher/pause' -e 'docker.io/rancher/coredns-coredns' /usr/tmp/k3s-images.txt)
+    xargs -n1 docker pull <<< "${images}"
+    docker save -o ./bin/k3s-airgap-images.tar ${images}
+else
+    touch bin/k3s-airgap-images.tar
+fi

scripts/package

 #!/bin/bash
 set -e
 
-./k3s-images.sh
-
 source $(dirname $0)/version
 
 ARCH=${ARCH:-"amd64"}
@@ -13,6 +11,8 @@ CHART_DEFAULT_BRANCH=${CHART_DEFAULT_BRANCH:-"dev-v2.6"}
 
 cd $(dirname $0)/../package
 
+../scripts/k3s-images.sh
+
 cp ../bin/rancher.yaml ../bin/rancher-namespace.yaml ../bin/rancher ../bin/agent ../bin/data.json ../bin/k3s-airgap-images.tar .
 
 IMAGE=${REPO}/rancher:${TAG}

scripts/run

@@ -14,4 +14,4 @@ mkdir -p build/testdata
 cd build/testdata
 export KUBECONFIG=
 export CATTLE_DEV_MODE=yes
-exec ../../$CMD --add-local=true --features=multi-cluster-management=true
+exec ../../$CMD

scripts/test

@@ -26,7 +26,7 @@ if [ ${ARCH} == arm64 ]; then
 fi
 
 echo Starting rancher server
-$(dirname $0)/run &> /dev/null &
+$(dirname $0)/run >/tmp/rancher.log 2>&1 &
 PID=$!
 trap cleanup exit