openinfra/refstack
Code Issues Proposed changes

Fix gate jobs

Browse Source 
* Updated PyOpenSSL package requirement as the version (0.13) we
were using before is causing issues in the new gate images being used
as this version won't build against newer versions of OpenSSL.

* Removed PhantomJS as a testing requirement. PhantomJS has setup
issues and causes npm jobs to consistently fail.

Change-Id: I2d7b293da2c00f22c96ab75d8ee24214dfe7c99c
This commit is contained in:
Paul Van Eck 2016-08-03 12:43:30 -07:00
parent fcac21f1bf
commit d2a492ec15
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -15,8 +15,6 @@
"karma-cli": "0.0.4", "karma-cli": "0.0.4",
"karma-firefox-launcher": "^0.1.3", "karma-firefox-launcher": "^0.1.3",
"karma-jasmine": "^0.2.2", "karma-jasmine": "^0.2.2",
"karma-phantomjs-launcher": "0.2.0",
"phantomjs": "2.1.1",
"protractor": "~1.0.0" "protractor": "~1.0.0"
}, },
"scripts": { "scripts": {

3
refstack-ui/tests/karma.conf.js
View File

@ -29,12 +29,11 @@ module.exports = function (config) {
frameworks: ['jasmine'], frameworks: ['jasmine'],
browsers: ['Firefox', 'PhantomJS', 'Chrome'], browsers: ['Firefox', 'Chrome'],
plugins: [ plugins: [
'karma-chrome-launcher', 'karma-chrome-launcher',
'karma-firefox-launcher', 'karma-firefox-launcher',
'karma-phantomjs-launcher',
'karma-jasmine' 'karma-jasmine'
], ],

2
requirements.txt
View File

@ -7,7 +7,7 @@ oslo.config>=1.6.0 # Apache-2.0
oslo.db>=1.4.1 # Apache-2.0 oslo.db>=1.4.1 # Apache-2.0
oslo.log oslo.log
pecan>=0.8.2 pecan>=0.8.2
pyOpenSSL==0.13 pyOpenSSL>=0.14
pycrypto>=2.6 pycrypto>=2.6
requests>=2.2.0,!=2.4.0 requests>=2.2.0,!=2.4.0
requests-cache>=0.4.9 requests-cache>=0.4.9