From c2ba6ce46cbe8035d7ea7397089649c16bfa7184 Mon Sep 17 00:00:00 2001
From: Shay Nehmad <shay.nehmad@guardicore.com>
Date: Thu, 7 Nov 2019 16:24:36 +0200
Subject: [PATCH] Changed structure - everything is the same job

---
 .travis.yml | 101 +++++++++++++++++++++++-----------------------------
 1 file changed, 44 insertions(+), 57 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d84aaae7e..d275b8e80 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,69 +1,56 @@
 # Infection Monkey travis.yml. See Travis documentation for information about this file structure.
-jobs:
-  include:
-    # The python job
-    -
-      group: travis_latest
 
-      language: python
+group: travis_latest
 
-      cache: pip
+language: python
 
-      python:
-      - 3.7
+cache: pip
 
-      os: linux
+python:
+- 3.7
 
-      install:
-      - pip install -r monkey/monkey_island/requirements.txt  # for unit tests
-      - pip install flake8 pytest dlint  # for next stages
-      - pip install -r monkey/infection_monkey/requirements_linux.txt  # for unit tests
+os: linux
 
-      before_script:
-      # Check syntax errors and fail the build if any are found.
-      - flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
+install:
+- pip install -r monkey/monkey_island/requirements.txt  # for unit tests
+- pip install flake8 pytest dlint  # for next stages
+- pip install -r monkey/infection_monkey/requirements_linux.txt  # for unit tests
 
-      # Warn about linter issues.
-      # --exit-zero forces Flake8 to use the exit status code 0 even if there are errors, which means this will NOT fail the build.
-      # --count will print the total number of errors.
-      # --statistics Count the number of occurrences of each error/warning code and print a report.
-      # The output is redirected to a file.
-      - flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics > flake8_warnings.txt
-      # Display the linter issues
-      - cat flake8_warnings.txt
-      # Make sure that we haven't increased the amount of warnings.
-      - WARNINGS_AMOUNT_UPPER_LIMIT=190
-      - if [ $(tail -n 1 flake8_warnings.txt) -gt $WARNINGS_AMOUNT_UPPER_LIMIT ]; then echo "Too many warnings! Failing this build. Lower the amount of linter errors in this and try again. " && exit 1; fi
+before_script:
+# Set the server config to `testing`, for the UTs to use mongomaock and pass.
+- python monkey/monkey_island/cc/set_server_config.py testing
 
-      # Set the server config to `testing`, for the UTs to use mongomaock and pass.
-      - python monkey/monkey_island/cc/set_server_config.py testing
+script:
+# Check Python code
+# Check syntax errors and fail the build if any are found.
+- flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
 
-      script:
-      - cd monkey  # This is our source dir
-      - python -m pytest  # Have to use `python -m pytest` instead of `pytest` to add "{$builddir}/monkey/monkey" to sys.path.
+# Warn about linter issues.
+# --exit-zero forces Flake8 to use the exit status code 0 even if there are errors, which means this will NOT fail the build.
+# --count will print the total number of errors.
+# --statistics Count the number of occurrences of each error/warning code and print a report.
+# The output is redirected to a file.
+- flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics > flake8_warnings.txt
+# Display the linter issues
+- cat flake8_warnings.txt
+# Make sure that we haven't increased the amount of warnings.
+- WARNINGS_AMOUNT_UPPER_LIMIT=190
+- if [ $(tail -n 1 flake8_warnings.txt) -gt $WARNINGS_AMOUNT_UPPER_LIMIT ]; then echo "Too many warnings! Failing this build. Lower the amount of linter errors in this and try again. " && exit 1; fi
 
-      notifications:
-        slack:  # Notify to slack
-            rooms:
-            - infectionmonkey:QaXbsx4g7tHFJW0lhtiBmoAg#ci  # room: #ci
-            on_success: change
-            on_failure: always
-        email:
-            on_success: change
-            on_failure: always
+- cd monkey  # This is our source dir
+- python -m pytest  # Have to use `python -m pytest` instead of `pytest` to add "{$builddir}/monkey/monkey" to sys.path.
 
-  # The JS job
-  -
-    group: travis_latest
-    language: node_js
-    cache:
-      directories:
-        - "node_modules"
-    sudo: false
-    script:
-      - pwd
-      - cd monkey_island/cc/ui
-      - pwd
-      - npm i -g eslint
-      - eslint ./src --quiet
-      - eslint ./src --max-warnings 100
\ No newline at end of file
+# Check JS code
+- cd monkey_island/cc/ui
+- eslint ./src --quiet
+- eslint ./src --max-warnings 100
+
+notifications:
+  slack:  # Notify to slack
+      rooms:
+      - infectionmonkey:QaXbsx4g7tHFJW0lhtiBmoAg#ci  # room: #ci
+      on_success: change
+      on_failure: always
+  email:
+      on_success: change
+      on_failure: always