ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2024-12-20 06:07:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1469 from balena-io/1447-drop-version-in-env

Browse Source 
version: drop SUPERVISOR_VERSION env var
This commit is contained in:
bulldozer-balena[bot] 2020-09-29 16:16:29 +00:00 committed by GitHub
commit ba30c8f1f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/compose/service.ts
View File

@ -966,7 +966,6 @@ export class Service {
DEVICE_TYPE: options.deviceType, DEVICE_TYPE: options.deviceType,
DEVICE_ARCH: options.deviceArch, DEVICE_ARCH: options.deviceArch,
HOST_OS_VERSION: options.osVersion, HOST_OS_VERSION: options.osVersion,
SUPERVISOR_VERSION: options.version,
APP_LOCK_PATH: '/tmp/balena/updates.lock', APP_LOCK_PATH: '/tmp/balena/updates.lock',
}, },
(_val, key) => `${namespace}_${key}`, (_val, key) => `${namespace}_${key}`,

2
test/04-service.spec.ts
View File

@ -65,7 +65,6 @@ describe('compose/service', () => {
RESIN_DEVICE_TYPE: 'raspberry-pi', RESIN_DEVICE_TYPE: 'raspberry-pi',
RESIN_HOST_OS_VERSION: 'Resin OS 2.0.2', RESIN_HOST_OS_VERSION: 'Resin OS 2.0.2',
RESIN_SERVICE_NAME: 'serviceName', RESIN_SERVICE_NAME: 'serviceName',
RESIN_SUPERVISOR_VERSION: 'v1.0.0',
RESIN_APP_LOCK_PATH: '/tmp/balena/updates.lock', RESIN_APP_LOCK_PATH: '/tmp/balena/updates.lock',
RESIN_SERVICE_KILL_ME_PATH: '/tmp/balena/handover-complete', RESIN_SERVICE_KILL_ME_PATH: '/tmp/balena/handover-complete',
RESIN: '1', RESIN: '1',
@ -76,7 +75,6 @@ describe('compose/service', () => {
BALENA_DEVICE_TYPE: 'raspberry-pi', BALENA_DEVICE_TYPE: 'raspberry-pi',
BALENA_HOST_OS_VERSION: 'Resin OS 2.0.2', BALENA_HOST_OS_VERSION: 'Resin OS 2.0.2',
BALENA_SERVICE_NAME: 'serviceName', BALENA_SERVICE_NAME: 'serviceName',
BALENA_SUPERVISOR_VERSION: 'v1.0.0',
BALENA_APP_LOCK_PATH: '/tmp/balena/updates.lock', BALENA_APP_LOCK_PATH: '/tmp/balena/updates.lock',
BALENA_SERVICE_HANDOVER_COMPLETE_PATH: '/tmp/balena/handover-complete', BALENA_SERVICE_HANDOVER_COMPLETE_PATH: '/tmp/balena/handover-complete',
BALENA: '1', BALENA: '1',

5
test/23-contracts.spec.ts
View File

@ -16,7 +16,7 @@ import supervisorVersion = require('../src/lib/supervisor-version');
describe('Container contracts', () => { describe('Container contracts', () => {
before(() => { before(() => {
intialiseContractRequirements({ intialiseContractRequirements({
supervisorVersion: '11.0.0', supervisorVersion,
deviceType: 'intel-nuc', deviceType: 'intel-nuc',
l4tVersion: '32.2', l4tVersion: '32.2',
}); });
@ -224,6 +224,7 @@ describe('Container contracts', () => {
) )
.to.have.property('valid') .to.have.property('valid')
.that.equals(true); .that.equals(true);
expect( expect(
containerContractsFulfilled({ containerContractsFulfilled({
service: { service: {
@ -442,7 +443,7 @@ describe('L4T version detection', () => {
} }
seedExec(version); seedExec(version);
intialiseContractRequirements({ intialiseContractRequirements({
supervisorVersion: '11.0.0', supervisorVersion,
deviceType: 'intel-nuc', deviceType: 'intel-nuc',
l4tVersion: await osRelease.getL4tVersion(), l4tVersion: await osRelease.getL4tVersion(),
}); });

2
test/data/docker-states/entrypoint/inspect.json
View File

@ -148,7 +148,6 @@
"RESIN_DEVICE_ARCH=amd64", "RESIN_DEVICE_ARCH=amd64",
"RESIN_DEVICE_TYPE=raspberrypi3", "RESIN_DEVICE_TYPE=raspberrypi3",
"RESIN_HOST_OS_VERSION=Resin OS 2.13.6+rev1", "RESIN_HOST_OS_VERSION=Resin OS 2.13.6+rev1",
"RESIN_SUPERVISOR_VERSION=7.18.0",
"RESIN_APP_LOCK_PATH=/tmp/balena/updates.lock", "RESIN_APP_LOCK_PATH=/tmp/balena/updates.lock",
"RESIN_SERVICE_KILL_ME_PATH=/tmp/balena/handover-complete", "RESIN_SERVICE_KILL_ME_PATH=/tmp/balena/handover-complete",
"RESIN=1", "RESIN=1",
@ -159,7 +158,6 @@
"BALENA_DEVICE_ARCH=amd64", "BALENA_DEVICE_ARCH=amd64",
"BALENA_DEVICE_TYPE=raspberrypi3", "BALENA_DEVICE_TYPE=raspberrypi3",
"BALENA_HOST_OS_VERSION=Resin OS 2.13.6+rev1", "BALENA_HOST_OS_VERSION=Resin OS 2.13.6+rev1",
"BALENA_SUPERVISOR_VERSION=7.18.0",
"BALENA_APP_LOCK_PATH=/tmp/balena/updates.lock", "BALENA_APP_LOCK_PATH=/tmp/balena/updates.lock",
"BALENA_SERVICE_HANDOVER_COMPLETE_PATH=/tmp/balena/handover-complete", "BALENA_SERVICE_HANDOVER_COMPLETE_PATH=/tmp/balena/handover-complete",
"BALENA=1", "BALENA=1",

2
test/data/docker-states/network-mode-service/inspect.json
View File

@ -148,7 +148,6 @@
"RESIN_DEVICE_ARCH=amd64", "RESIN_DEVICE_ARCH=amd64",
"RESIN_DEVICE_TYPE=raspberrypi3", "RESIN_DEVICE_TYPE=raspberrypi3",
"RESIN_HOST_OS_VERSION=Resin OS 2.13.6+rev1", "RESIN_HOST_OS_VERSION=Resin OS 2.13.6+rev1",
"RESIN_SUPERVISOR_VERSION=7.16.6",
"RESIN_APP_LOCK_PATH=/tmp/balena/updates.lock", "RESIN_APP_LOCK_PATH=/tmp/balena/updates.lock",
"RESIN_SERVICE_KILL_ME_PATH=/tmp/balena/handover-complete", "RESIN_SERVICE_KILL_ME_PATH=/tmp/balena/handover-complete",
"RESIN=1", "RESIN=1",
@ -159,7 +158,6 @@
"BALENA_DEVICE_ARCH=amd64", "BALENA_DEVICE_ARCH=amd64",
"BALENA_DEVICE_TYPE=raspberrypi3", "BALENA_DEVICE_TYPE=raspberrypi3",
"BALENA_HOST_OS_VERSION=Resin OS 2.13.6+rev1", "BALENA_HOST_OS_VERSION=Resin OS 2.13.6+rev1",
"BALENA_SUPERVISOR_VERSION=7.16.6",
"BALENA_APP_LOCK_PATH=/tmp/balena/updates.lock", "BALENA_APP_LOCK_PATH=/tmp/balena/updates.lock",
"BALENA_SERVICE_HANDOVER_COMPLETE_PATH=/tmp/balena/handover-complete", "BALENA_SERVICE_HANDOVER_COMPLETE_PATH=/tmp/balena/handover-complete",
"BALENA=1", "BALENA=1",

2
test/data/docker-states/simple/inspect.json
View File

@ -148,7 +148,6 @@
"RESIN_DEVICE_ARCH=amd64", "RESIN_DEVICE_ARCH=amd64",
"RESIN_DEVICE_TYPE=raspberrypi3", "RESIN_DEVICE_TYPE=raspberrypi3",
"RESIN_HOST_OS_VERSION=Resin OS 2.13.6+rev1", "RESIN_HOST_OS_VERSION=Resin OS 2.13.6+rev1",
"RESIN_SUPERVISOR_VERSION=7.16.6",
"RESIN_APP_LOCK_PATH=/tmp/balena/updates.lock", "RESIN_APP_LOCK_PATH=/tmp/balena/updates.lock",
"RESIN_SERVICE_KILL_ME_PATH=/tmp/balena/handover-complete", "RESIN_SERVICE_KILL_ME_PATH=/tmp/balena/handover-complete",
"RESIN=1", "RESIN=1",
@ -159,7 +158,6 @@
"BALENA_DEVICE_ARCH=amd64", "BALENA_DEVICE_ARCH=amd64",
"BALENA_DEVICE_TYPE=raspberrypi3", "BALENA_DEVICE_TYPE=raspberrypi3",
"BALENA_HOST_OS_VERSION=Resin OS 2.13.6+rev1", "BALENA_HOST_OS_VERSION=Resin OS 2.13.6+rev1",
"BALENA_SUPERVISOR_VERSION=7.16.6",
"BALENA_APP_LOCK_PATH=/tmp/balena/updates.lock", "BALENA_APP_LOCK_PATH=/tmp/balena/updates.lock",
"BALENA_SERVICE_HANDOVER_COMPLETE_PATH=/tmp/balena/handover-complete", "BALENA_SERVICE_HANDOVER_COMPLETE_PATH=/tmp/balena/handover-complete",
"BALENA=1", "BALENA=1",

2
test/data/docker-states/supervisor-api/inspect.json
View File

@ -168,7 +168,6 @@
"BALENA_DEVICE_TYPE=raspberrypi4-64", "BALENA_DEVICE_TYPE=raspberrypi4-64",
"BALENA_DEVICE_ARCH=aarch64", "BALENA_DEVICE_ARCH=aarch64",
"BALENA_HOST_OS_VERSION=balenaOS 2.48.0+rev1", "BALENA_HOST_OS_VERSION=balenaOS 2.48.0+rev1",
"BALENA_SUPERVISOR_VERSION=11.6.6",
"BALENA_APP_LOCK_PATH=/tmp/balena/updates.lock", "BALENA_APP_LOCK_PATH=/tmp/balena/updates.lock",
"BALENA=1", "BALENA=1",
"RESIN_APP_ID=1623449", "RESIN_APP_ID=1623449",
@ -178,7 +177,6 @@
"RESIN_DEVICE_TYPE=raspberrypi4-64", "RESIN_DEVICE_TYPE=raspberrypi4-64",
"RESIN_DEVICE_ARCH=aarch64", "RESIN_DEVICE_ARCH=aarch64",
"RESIN_HOST_OS_VERSION=balenaOS 2.48.0+rev1", "RESIN_HOST_OS_VERSION=balenaOS 2.48.0+rev1",
"RESIN_SUPERVISOR_VERSION=11.6.6",
"RESIN_APP_LOCK_PATH=/tmp/balena/updates.lock", "RESIN_APP_LOCK_PATH=/tmp/balena/updates.lock",
"RESIN=1", "RESIN=1",
"RESIN_SERVICE_KILL_ME_PATH=/tmp/balena/handover-complete", "RESIN_SERVICE_KILL_ME_PATH=/tmp/balena/handover-complete",