Remove envinject from javascript
Instead source the properties into the environment. The macros js-build and assert-no-extra-files did not require any of the properties and as such do not require updating. Change-Id: I3297b2d9d503425e5d586d83eaab4f6c8e65039a
This commit is contained in:
parent
96b4fad591
commit
d7cec1d1ac
@ -10,11 +10,6 @@
|
|||||||
builders:
|
builders:
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- gerrit-git-prep
|
- gerrit-git-prep
|
||||||
- shell: |
|
|
||||||
#!/bin/bash -xe
|
|
||||||
/usr/local/jenkins/slave_scripts/version-properties.sh
|
|
||||||
- inject:
|
|
||||||
properties-file: version.properties
|
|
||||||
- js-build:
|
- js-build:
|
||||||
command: 'test'
|
command: 'test'
|
||||||
envlist: 'grunt'
|
envlist: 'grunt'
|
||||||
@ -47,11 +42,6 @@
|
|||||||
builders:
|
builders:
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- gerrit-git-prep
|
- gerrit-git-prep
|
||||||
- shell: |
|
|
||||||
#!/bin/bash -xe
|
|
||||||
/usr/local/jenkins/slave_scripts/version-properties.sh
|
|
||||||
- inject:
|
|
||||||
properties-file: version.properties
|
|
||||||
- js-build:
|
- js-build:
|
||||||
command: 'build'
|
command: 'build'
|
||||||
envlist: 'grunt'
|
envlist: 'grunt'
|
||||||
@ -59,6 +49,8 @@
|
|||||||
project: '{name}'
|
project: '{name}'
|
||||||
- shell: |
|
- shell: |
|
||||||
#!/bin/bash -xe
|
#!/bin/bash -xe
|
||||||
|
/usr/local/jenkins/slave_scripts/version-properties.sh
|
||||||
|
source version.properties
|
||||||
|
|
||||||
# Clean/create a tarball directory
|
# Clean/create a tarball directory
|
||||||
rm -rf tarballs
|
rm -rf tarballs
|
||||||
|
Loading…
x
Reference in New Issue
Block a user