diff --git a/artifacts.go b/artifacts.go index 29f58cb19..af3451048 100644 --- a/artifacts.go +++ b/artifacts.go @@ -24,5 +24,5 @@ var CurrentArtifacts = ArtifactSet{ Debs: []DebianPackage{ {Name: "etcdpasswd", Owner: "cybozu-go", Repository: "etcdpasswd", Release: "v1.4.8"}, }, - OSImage: OSImage{Channel: "stable", Version: "3815.2.5"}, + OSImage: OSImage{Channel: "stable", Version: "3975.2.2"}, } diff --git a/artifacts_ignore.yaml b/artifacts_ignore.yaml index 692271756..c78032b71 100644 --- a/artifacts_ignore.yaml +++ b/artifacts_ignore.yaml @@ -1,6 +1,3 @@ images: - repository: ghcr.io/cybozu/etcd versions: ["3.5.15.1"] -osImage: -- channel: stable - versions: ["3975.2.0","3975.2.1","3975.2.2"] diff --git a/debian/usr/bin/trigger-reboot-all-nodes b/debian/usr/bin/trigger-reboot-all-nodes index 376448c8f..96c93df97 100755 --- a/debian/usr/bin/trigger-reboot-all-nodes +++ b/debian/usr/bin/trigger-reboot-all-nodes @@ -3,6 +3,7 @@ CKECLI_COMMAND="/usr/bin/ckecli" NECO_COMMAND="/usr/bin/neco" UNAME_COMMAND="/usr/bin/uname" YES_COMMAND="/usr/bin/yes" +NOREBOOT_FILE="/tmp/no-reboot" ENVIROMENT=$(${NECO_COMMAND} config get env) if [ "$ENVIROMENT" != "dev" ]; then @@ -10,6 +11,11 @@ if [ "$ENVIROMENT" != "dev" ]; then exit 0 fi +if [ -f ${NOREBOOT_FILE} ]; then + echo "The no-reboot file exists. Skipping reboot all nodes" + exit 0 +fi + # Confirm that host is a learder HOSTNAME=$(${UNAME_COMMAND} -n) LEADER=$(${NECO_COMMAND} rebooter leader)