From e32043f58a2450b6a5986dc2a01f64f8b22c3992 Mon Sep 17 00:00:00 2001 From: "Yang (Gabriel) Yu" Date: Tue, 4 Sep 2018 21:02:27 +0800 Subject: Change naming and veriy test-scheduler function Changes: 1. Testing-scheduler -> Test-scheduler 2. lots of windows breaks '\r' and '^M' in files, batch changes to unix breaks '$' 3. Add ui/build Change-Id: I1f2c98ab9348460d4e68bfbfab664dae82b761ba Signed-off-by: Yang (Gabriel) Yu --- testing-scheduler/ui/config/default.conf | 71 ------------------------ testing-scheduler/ui/config/dev.env.js | 7 --- testing-scheduler/ui/config/index.js | 95 -------------------------------- testing-scheduler/ui/config/prod.env.js | 4 -- 4 files changed, 177 deletions(-) delete mode 100644 testing-scheduler/ui/config/default.conf delete mode 100644 testing-scheduler/ui/config/dev.env.js delete mode 100644 testing-scheduler/ui/config/index.js delete mode 100644 testing-scheduler/ui/config/prod.env.js (limited to 'testing-scheduler/ui/config') diff --git a/testing-scheduler/ui/config/default.conf b/testing-scheduler/ui/config/default.conf deleted file mode 100644 index be910b4e..00000000 --- a/testing-scheduler/ui/config/default.conf +++ /dev/null @@ -1,71 +0,0 @@ -server { - listen 5311; - server_name localhost; - - #charset koi8-r; - #access_log /var/log/nginx/log/host.access.log main; - - location / { - root /usr/share/nginx/html; - index index.html index.htm; - } - - - #error_page 404 /404.html; - - # redirect server error pages to the static page /50x.html - # - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root html; - } - - # proxy the PHP scripts to Apache listening on 127.0.0.1:80 - # - #location ~ \.php$ { - # proxy_pass http://127.0.0.1; - #} - location ^~/parser/ { - rewrite ^/parser/(.*)$ /$1 break; - proxy_set_header Host $host; - proxy_set_header x-forwarded-for $remote_addr; - proxy_set_header X-Real-IP $remote_addr; - proxy_pass http://t-scheduler-server:5310; - } - location ^~/wf-graph/ { - rewrite ^/wf-graph/(.*)$ /$1 break; - proxy_set_header Host $host; - proxy_set_header x-forwarded-for $remote_addr; - proxy_set_header X-Real-IP $remote_addr; - proxy_pass http://conductor_conductor-ui_1:5000; - } - location ^~/api/ { - proxy_set_header Host $host; - proxy_set_header x-forwarded-for $remote_addr; - proxy_set_header X-Real-IP $remote_addr; - proxy_pass http://conductor_conductor-ui_1:5000; - } - location ^~/wf-server/ { - rewrite ^/wf-server/(.*)$ /$1 break; - proxy_set_header Host $host; - proxy_set_header x-forwarded-for $remote_addr; - proxy_set_header X-Real-IP $remote_addr; - proxy_pass http://conductor_conductor-server_1:8080; - } - # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 - # - #location ~ \.php$ { - # root html; - # fastcgi_pass 127.0.0.1:9000; - # fastcgi_index index.php; - # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; - # include fastcgi_params; - #} - - # deny access to .htaccess files, if Apache's document root - # concurs with nginx's one - # - #location ~ /\.ht { - # deny all; - #} -} diff --git a/testing-scheduler/ui/config/dev.env.js b/testing-scheduler/ui/config/dev.env.js deleted file mode 100644 index 00dc9f3d..00000000 --- a/testing-scheduler/ui/config/dev.env.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict' -const merge = require('webpack-merge') -const prodEnv = require('./prod.env') - -module.exports = merge(prodEnv, { - NODE_ENV: '"development"' -}) diff --git a/testing-scheduler/ui/config/index.js b/testing-scheduler/ui/config/index.js deleted file mode 100644 index 0cf45520..00000000 --- a/testing-scheduler/ui/config/index.js +++ /dev/null @@ -1,95 +0,0 @@ -'use strict' -// Template version: 1.3.1 -// see http://vuejs-templates.github.io/webpack for documentation. - -const path = require('path') - -module.exports = { - dev: { - - // Paths - assetsSubDirectory: 'static', - assetsPublicPath: '/', - proxyTable: { - '/wf-graph': { - target: 'http://conductor_conductor-ui_1:5000/', - changeOrigin: true, - pathRewrite: {'^/wf-graph':''} - }, - '/api': { - target: 'http://conductor_conductor-ui_1:5000/', - changeOrigin: true - }, - '/wf-server': { - target: 'http://conductor_conductor-server_1:8080/', - changeOrigin: true, - pathRewrite: {'^/workflow':''} - }, - '/parser': { - target: 'http://t-scheduler-server:5310/', - pathRewrite: {'^/parser':''} - } - }, - - // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST - port: 5311, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined - autoOpenBrowser: false, - errorOverlay: true, - notifyOnErrors: true, - poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions- - - // Use Eslint Loader? - // If true, your code will be linted during bundling and - // linting errors and warnings will be shown in the console. - useEslint: true, - // If true, eslint errors and warnings will also be shown in the error overlay - // in the browser. - showEslintErrorsInOverlay: false, - - /** - * Source Maps - */ - - // https://webpack.js.org/configuration/devtool/#development - devtool: 'cheap-module-eval-source-map', - - // If you have problems debugging vue-files in devtools, - // set this to false - it *may* help - // https://vue-loader.vuejs.org/en/options.html#cachebusting - cacheBusting: true, - - cssSourceMap: true - }, - - build: { - // Template for index.html - index: path.resolve(__dirname, '../dist/index.html'), - - // Paths - assetsRoot: path.resolve(__dirname, '../dist'), - assetsSubDirectory: 'static', - assetsPublicPath: '/', - - /** - * Source Maps - */ - - productionSourceMap: true, - // https://webpack.js.org/configuration/devtool/#production - devtool: '#source-map', - - // Gzip off by default as many popular static hosts such as - // Surge or Netlify already gzip all static assets for you. - // Before setting to `true`, make sure to: - // npm install --save-dev compression-webpack-plugin - productionGzip: false, - productionGzipExtensions: ['js', 'css'], - - // Run the build command with an extra argument to - // View the bundle analyzer report after build finishes: - // `npm run build --report` - // Set to `true` or `false` to always turn it on or off - bundleAnalyzerReport: process.env.npm_config_report - } -} diff --git a/testing-scheduler/ui/config/prod.env.js b/testing-scheduler/ui/config/prod.env.js deleted file mode 100644 index d5513323..00000000 --- a/testing-scheduler/ui/config/prod.env.js +++ /dev/null @@ -1,4 +0,0 @@ -'use strict' -module.exports = { - NODE_ENV: '"production"' -} -- cgit 1.2.3-korg