[Fuego] [PATCH 1/1][fuego-core] Change default fuego port from 8080 to 8090

Fathi Boudra fathi.boudra at linaro.org
Fri Apr 12 08:45:57 UTC 2019


Signed-off-by: Fathi Boudra <fathi.boudra at linaro.org>
---
 scripts/common.sh                               |  2 +-
 scripts/ftc                                     |  5 ++---
 scripts/parser/prepare_chart_data.py            |  4 ++--
 tests/Functional.busybox/fuego_test.sh          |  2 +-
 tests/Functional.fuego_release_test/README.md   | 16 ++++++++--------
 tests/Functional.fuego_release_test/test_run.py |  2 +-
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/scripts/common.sh b/scripts/common.sh
index 2df5a29..8b6bed3 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -138,7 +138,7 @@ function abort_job {
 
   # BUILD_URL should be defined. But if not, use a default
   if [ -z "$BUILD_URL" ] ; then
-    PORT=${JENKINS_PORT:8080}
+    PORT=${JENKINS_PORT:8090}
     BUILD_URL="http://localhost:$PORT/fuego/job/$JOB_NAME/$BUILD_NUMBER"
   fi
   # sync tty data before telling Jenkins to terminate the job
diff --git a/scripts/ftc b/scripts/ftc
index 8d583e3..db83b94 100755
--- a/scripts/ftc
+++ b/scripts/ftc
@@ -74,7 +74,6 @@ ll_info = True
 ll_warning = True
 
 # setup server later, to allow later import of 'jenkins' module
-#server = jenkins.Jenkins('http://localhost:8080/fuego')
 server = None
 
 # keep configuration file in /fuego-ro/conf area
@@ -539,8 +538,8 @@ class config_class:
                 self.JENKINS_PORT = os.environ["JENKINS_PORT"]
                 self.JENKINS_URL = "http://"+self.JENKINS_HOSTNAME+":"+self.JENKINS_PORT+"/fuego"
             except:
-                wprint("JENKINS_PORT not found in environment, using port 8080")
-                self.JENKINS_URL = "http://"+self.JENKINS_HOSTNAME+":8080/fuego"
+                wprint("JENKINS_PORT not found in environment, using default port 8090")
+                self.JENKINS_URL = "http://"+self.JENKINS_HOSTNAME+":8090/fuego"
         else:
             self.JENKINS_HOME = "none"
             self.JENKINS_URL = "none"
diff --git a/scripts/parser/prepare_chart_data.py b/scripts/parser/prepare_chart_data.py
index f64c408..fa5e558 100644
--- a/scripts/parser/prepare_chart_data.py
+++ b/scripts/parser/prepare_chart_data.py
@@ -416,7 +416,7 @@ def make_measure_plots(test_name, chart_config, entries):
 def make_measure_tables(test_name, chart_config, entries):
     # make a table of testcase results for every testcase
     chart_list = []
-    # the value of 'JENKINS_URL' is "http://localhost:8080/fuego/", which is not we want.
+    # the value of 'JENKINS_URL' is "http://localhost:8090/fuego/", which is not we want.
     jenkins_url_prefix = "/fuego"
 
     # get a list of (board, test specs) in the data
@@ -594,7 +594,7 @@ def cmp_alpha_num(a, b):
 def make_testcase_table(test_name, chart_config, entries):
     # make a table of testcase results for every testcase
     chart_list = []
-    # the value of 'JENKINS_URL' is "http://localhost:8080/fuego/", which is not we want.
+    # the value of 'JENKINS_URL' is "http://localhost:8090/fuego/", which is not we want.
     jenkins_url_prefix = "/fuego"
 
     # get a list of (board,test sets) in the data
diff --git a/tests/Functional.busybox/fuego_test.sh b/tests/Functional.busybox/fuego_test.sh
index a7aef3e..3abd743 100755
--- a/tests/Functional.busybox/fuego_test.sh
+++ b/tests/Functional.busybox/fuego_test.sh
@@ -77,7 +77,7 @@ function test_deploy {
 function test_run {
     report "cd $BOARD_TESTDIR/fuego.$TESTDIR; \
         export test_tcpip_host=$SRV_IP; \
-        export test_port_host=${SRV_PORT:=8080}; \
+        export test_port_host=${SRV_PORT:=8090}; \
         export test_ipaddr=$IPADDR;\
         sh -v busybox_test.sh"
 }
diff --git a/tests/Functional.fuego_release_test/README.md b/tests/Functional.fuego_release_test/README.md
index fbe4360..f6aaeb8 100644
--- a/tests/Functional.fuego_release_test/README.md
+++ b/tests/Functional.fuego_release_test/README.md
@@ -55,10 +55,10 @@ $ ./test_run.py -d . -o . ~/fuego
 Same as above, but do not remove (neither stops) the `fuego-container` after
 the execution of the tests, and use `/tmp` as output dir (default). You'll be
 able to access the inner Jenkins (Fuego that runs inside Fuego) through
-`${fuego_container_ip}:8080/fuego`. The `fuego_container ip` is dynamically set
+`${fuego_container_ip}:8090/fuego`. The `fuego_container ip` is dynamically set
 by docker, and is displayed in the first lines of the output of the script.
 ```
-$ ./test_run.py --no-rm-container -p 8080 -d . ~/fuego
+$ ./test_run.py --no-rm-container -p 8090 -d . ~/fuego
 ```
 
 Output example with the IP of the container:
@@ -67,7 +67,7 @@ Output example with the IP of the container:
 test_run:INFO: Container 'fuego-release-container' successfully created
 test_run:INFO: Starting container 'fuego-release-container'...
 test_run:INFO: Container started with the ip '172.17.0.2'
-test_run:INFO: Waiting for jenkins on '172.17.0.2:8080'...
+test_run:INFO: Waiting for jenkins on '172.17.0.2:8090'...
 ...
 
 ```
@@ -104,7 +104,7 @@ ShExpect('ftc list-nodes -q', r'.*docker.*')
 Ask for SeleniumHQ to visit a given URL.
 
 ```
-Visit(url='http://localhost:8080/fuego')
+Visit(url='http://localhost:8090/fuego')
 ```
 
 #### Click
@@ -166,17 +166,17 @@ examples are given below:
 #### Full Screen
 
 Take a full viewport screenshot (default resolution is 1920x1080) from
-`http://localhost:8080/fuego` and save it in the current directory as
+`http://localhost:8090/fuego` and save it in the current directory as
 `full_viewport.png`.
 
 ```
-./take_screenshot.py http://localhost:8080/fuego
+./take_screenshot.py http://localhost:8090/fuego
 ```
 
 Take a full viewport screenshot as above, but sets the viewport to 800x600
 
 ```
-./take_screenshot.py http://localhost:8080/fuego -r 800x600
+./take_screenshot.py http://localhost:8090/fuego -r 800x600
 ```
 
 #### Element Screenshot
@@ -185,5 +185,5 @@ Finds a element by CLASS_NAME (-l locator) that matches the string
 `CLASS_NAME_page_generated.png`.
 
 ```
-./take_screenshot.py http://172.17.0.2:8080/fuego/ -l CLASS_NAME -p page_generated
+./take_screenshot.py http://172.17.0.2:8090/fuego/ -l CLASS_NAME -p page_generated
 ```
diff --git a/tests/Functional.fuego_release_test/test_run.py b/tests/Functional.fuego_release_test/test_run.py
index d3c65f6..6d601d3 100755
--- a/tests/Functional.fuego_release_test/test_run.py
+++ b/tests/Functional.fuego_release_test/test_run.py
@@ -726,7 +726,7 @@ def main():
     DEFAULT_CONTAINER_NAME = 'fuego-release-container'
     DEFAULT_INSTALL_SCRIPT = 'install.sh'
     DEFAULT_START_SCRIPT = 'fuego-host-scripts/docker-start-container.sh'
-    DEFAULT_JENKINS_PORT = 8080
+    DEFAULT_JENKINS_PORT = 8090
     DEFAULT_OUTPUT_DIR = '/tmp'
     DEFAULT_LOCALE = 'en_US.UTF-8'
 
-- 
2.20.1



More information about the Fuego mailing list