Browse Source

Continuous integration build option

Bob Mottram 7 years ago
parent
commit
dfc1272cb3

+ 7
- 0
src/freedombone-image View File

74
 USERNAME="$USER"
74
 USERNAME="$USER"
75
 PASSWORD=
75
 PASSWORD=
76
 
76
 
77
+CONTINUOUS_INTEGRATION=
78
+
77
 # IP address of the router (gateway)
79
 # IP address of the router (gateway)
78
 ROUTER_IP_ADDRESS="192.168.1.254"
80
 ROUTER_IP_ADDRESS="192.168.1.254"
79
 
81
 
378
             shift
380
             shift
379
             INTERACTIVE="$1"
381
             INTERACTIVE="$1"
380
             ;;
382
             ;;
383
+        --ci)
384
+            shift
385
+            CONTINUOUS_INTEGRATION="$1"
386
+            ;;
381
         -g|--generic)
387
         -g|--generic)
382
             shift
388
             shift
383
             GENERIC_IMAGE="$1"
389
             GENERIC_IMAGE="$1"
614
      AMNESIC="$AMNESIC" \
620
      AMNESIC="$AMNESIC" \
615
      SOCIALINSTANCE="$SOCIALINSTANCE" \
621
      SOCIALINSTANCE="$SOCIALINSTANCE" \
616
      EXTERNAL_DRIVE="$EXTERNAL_DRIVE" \
622
      EXTERNAL_DRIVE="$EXTERNAL_DRIVE" \
623
+     CONTINUOUS_INTEGRATION="$CONTINUOUS_INTEGRATION" \
617
      LOCAL_NAME="$LOCAL_NAME"
624
      LOCAL_NAME="$LOCAL_NAME"
618
 
625
 
619
 # shellcheck disable=SC2181
626
 # shellcheck disable=SC2181

+ 2
- 0
src/freedombone-image-customise View File

139
 BMX7_REPO="https://github.com/bmx-routing/bmx7"
139
 BMX7_REPO="https://github.com/bmx-routing/bmx7"
140
 BMX7_COMMIT='0a82c7c10fef44b259b35e77ab33632aa132d219'
140
 BMX7_COMMIT='0a82c7c10fef44b259b35e77ab33632aa132d219'
141
 
141
 
142
+CONTINUOUS_INTEGRATION=
143
+
142
 PATH=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin
144
 PATH=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin
143
 
145
 
144
 # Whether to use a SATA drive and if so what its device/partition name is
146
 # Whether to use a SATA drive and if so what its device/partition name is

+ 2
- 0
src/freedombone-image-make View File

78
 export SOCIALINSTANCE
78
 export SOCIALINSTANCE
79
 export LOCAL_NAME
79
 export LOCAL_NAME
80
 export EXTERNAL_DRIVE
80
 export EXTERNAL_DRIVE
81
+export CONTINUOUS_INTEGRATION
81
 
82
 
82
 # Locate vmdebootstrap program fetched in Makefile
83
 # Locate vmdebootstrap program fetched in Makefile
83
 basedir=`pwd`
84
 basedir=`pwd`
228
 sed -i "s|LOCAL_NAME=.*|LOCAL_NAME=\"${LOCAL_NAME}\"|g" "$TEMP_CUSTOMISE3"
229
 sed -i "s|LOCAL_NAME=.*|LOCAL_NAME=\"${LOCAL_NAME}\"|g" "$TEMP_CUSTOMISE3"
229
 sed -i "s|EXTERNAL_DRIVE=.*|EXTERNAL_DRIVE=\"${EXTERNAL_DRIVE}\"|g" "$TEMP_CUSTOMISE3"
230
 sed -i "s|EXTERNAL_DRIVE=.*|EXTERNAL_DRIVE=\"${EXTERNAL_DRIVE}\"|g" "$TEMP_CUSTOMISE3"
230
 sed -i 's|#!/bin/bash||g' "$TEMP_CUSTOMISE3"
231
 sed -i 's|#!/bin/bash||g' "$TEMP_CUSTOMISE3"
232
+sed -i "s|CONTINUOUS_INTEGRATION=.*|CONTINUOUS_INTEGRATION=${CONTINUOUS_INTEGRATION}|g" "$TEMP_CUSTOMISE3"
231
 
233
 
232
 cat $TEMP_CUSTOMISE2 $TEMP_CUSTOMISE3 > $TEMP_CUSTOMISE4
234
 cat $TEMP_CUSTOMISE2 $TEMP_CUSTOMISE3 > $TEMP_CUSTOMISE4
233
 if [ -f $TEMP_CUSTOMISE ]; then
235
 if [ -f $TEMP_CUSTOMISE ]; then

+ 4
- 2
src/freedombone-image-makefile View File

41
 ARCHIVE = $(IMAGE).xz
41
 ARCHIVE = $(IMAGE).xz
42
 SIGNATURE = $(ARCHIVE).sig
42
 SIGNATURE = $(ARCHIVE).sig
43
 OWNER = 1000
43
 OWNER = 1000
44
-XZ = xz --no-warn --verbose --keep --threads=0 -3
45
-SIGN = -gpg --output $(SIGNATURE) --detach-sig $(ARCHIVE)
44
+if [ ! "$CONTINUOUS_INTEGRATION" ];
45
+    XZ = xz --no-warn --verbose --keep --threads=0 -3
46
+    SIGN = -gpg --output $(SIGNATURE) --detach-sig $(ARCHIVE)
47
+fi
46
 
48
 
47
 # settings for `make test`
49
 # settings for `make test`
48
 TEST_SSH_PORT = 2222
50
 TEST_SSH_PORT = 2222