ceph-dashboard-*, ceph-api-nightly: Remove conditional-step; Replaced dir name; split-up

scripts

Split up the script which installs dependencies, since e2e and backend API tests require
different packages. Adapt all jobs to use the dedicated scripts.
Also remove the conditional step to not only execute the script that installs dependencies
for e2e test environments

Signed-off-by: Laura Paduano <lpaduano@suse.com>

diff --git a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
index 50105c0df1536764b0929dff3e75e3dcf9acc982..923b633590d58c9cdee2a7a725abea271d0fc39a 100644 (file)
--- a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
+++ b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
@@ -7,8 +7,10 @@
     test_suite:
       - backend:
           test_suite_script: run-backend-api-tests.sh
+          test_deps_script: install-backend-api-test-deps.sh
       - e2e:
           test_suite_script: run-frontend-e2e-tests.sh
+          test_deps_script: install-e2e-test-deps.sh
     jobs:
       - '{name}-{ceph_branch}-{test_suite}'
 
@@ -18,7 +20,7 @@
     project-type: freestyle
     defaults: global
     concurrent: true
-    node: huge && x86_64 && centos7 && rebootable
+    node: huge && bionic && rebootable && x86_64 && !xenial && !trusty
     quiet-period: 5
     block-downstream: false
     block-upstream: false
@@ -51,13 +53,9 @@
 
     builders:
       - shell: "export NPROC=$(nproc); {ceph_build}"
-      - conditional-step:
-          condition-kind: strings-match
-          condition-string1: '{test_suite}'
-          condition-string2: 'e2e'
-          steps:
-            - shell:
-                !include-raw: ../../../scripts/e2e/install-e2e-tests-deps.sh
+      - shell:
+          !include-raw:
+            -  ../../../scripts/dashboard/{test_deps_script}
       - shell: "cd src/pybind/mgr/dashboard; timeout 2h ./{test_suite_script}"
 
     publishers:

diff --git a/ceph-dashboard-pr-backend/config/definitions/ceph-dashboard-pr-backend.yml b/ceph-dashboard-pr-backend/config/definitions/ceph-dashboard-pr-backend.yml
index 65c263dd4cb13bb6e1e6510a9607b72cbbf9fddf..c6a0e4b65222b56e94a591dd1eef1362461b4457 100644 (file)
--- a/ceph-dashboard-pr-backend/config/definitions/ceph-dashboard-pr-backend.yml
+++ b/ceph-dashboard-pr-backend/config/definitions/ceph-dashboard-pr-backend.yml
@@ -3,7 +3,7 @@
     project-type: freestyle
     defaults: global
     concurrent: true
-    node: huge && x86_64 && centos7 && rebootable
+    node: huge && bionic && rebootable && x86_64 && !xenial && !trusty
     display-name: 'ceph: dashboard Pull Requests backend'
     quiet-period: 5
     block-downstream: false
@@ -61,4 +61,5 @@
           !include-raw:
             - ../../../scripts/build_utils.sh
             - ../../build/build
+            - ../../../scripts/dashboard/install-backend-api-test-deps.sh
       - shell: "cd src/pybind/mgr/dashboard; timeout 7200 ./run-backend-api-tests.sh"

diff --git a/ceph-dashboard-pull-requests/config/definitions/ceph-dashboard-pull-requests.yml b/ceph-dashboard-pull-requests/config/definitions/ceph-dashboard-pull-requests.yml
index 458d2d6428183604f370e3a9f43d657bb057bbda..94f247a4ea6929a887778da4e9a3d6f33cc4c937 100644 (file)
--- a/ceph-dashboard-pull-requests/config/definitions/ceph-dashboard-pull-requests.yml
+++ b/ceph-dashboard-pull-requests/config/definitions/ceph-dashboard-pull-requests.yml
@@ -3,7 +3,7 @@
     project-type: freestyle
     defaults: global
     concurrent: true
-    node: huge && x86_64 && centos7 && rebootable
+    node: huge && bionic && rebootable && x86_64 && !xenial && !trusty
     display-name: 'ceph: dashboard Pull Requests'
     quiet-period: 5
     block-downstream: false
@@ -61,5 +61,5 @@
       - shell: "export NPROC=$(nproc) CHECK_MAKEOPTS='-j$(nproc) -N -Q'; timeout 7200 ./run-make-check.sh"
       - shell:
           !include-raw:
-            - ../../../scripts/e2e/install-e2e-tests-deps.sh
+            - ../../../scripts/dashboard/install-e2e-test-deps.sh
       - shell: "cd src/pybind/mgr/dashboard; timeout 7200 ./run-frontend-e2e-tests.sh"

diff --git a/scripts/dashboard/install-backend-api-test-deps.sh b/scripts/dashboard/install-backend-api-test-deps.sh
new file mode 100644 (file)
index 0000000..69b8100
--- /dev/null
+++ b/scripts/dashboard/install-backend-api-test-deps.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -ex
+
+if grep -q  debian /etc/*-release; then
+    sudo apt-get install -y python-scipy python3-scipy python-routes python3-routes
+elif grep -q rhel /etc/*-release; then
+    sudo yum install -y scipy python-routes python3-routes
+fi

diff --git a/scripts/dashboard/install-e2e-test-deps.sh b/scripts/dashboard/install-e2e-test-deps.sh
new file mode 100644 (file)
index 0000000..936cf6e
--- /dev/null
+++ b/scripts/dashboard/install-e2e-test-deps.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+set -ex
+
+if [[ ! $(arch) =~ (i386|x86_64|amd64) ]]; then
+    # google chrome is only available on amd64
+    exit
+fi
+
+if grep -q  debian /etc/*-release; then
+    sudo bash -c 'echo "deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list'
+    curl -fsSL https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+    sudo apt-get update
+    sudo apt-get install -y google-chrome-stable
+    sudo apt-get install -y python-requests python3-requests python-openssl python3-openssl python-jinja2 python3-jinja2 \
+       python-jwt python3-jwt python-scipy python3-scipy python-routes python3-routes
+    sudo rm /etc/apt/sources.list.d/google-chrome.list
+elif grep -q rhel /etc/*-release; then
+    sudo dd of=/etc/yum.repos.d/google-chrome.repo status=none <<EOF
+[google-chrome]
+name=google-chrome
+baseurl=https://dl.google.com/linux/chrome/rpm/stable/\$basearch
+enabled=1
+gpgcheck=1
+gpgkey=https://dl-ssl.google.com/linux/linux_signing_key.pub
+EOF
+    sudo yum install -y google-chrome-stable
+    sudo rm /etc/yum.repos.d/google-chrome.repo
+    sudo yum install -y python-requests pyOpenSSL python-jinja2 python-jwt scipy python-routes python3-routes
+fi

diff --git a/scripts/e2e/install-e2e-tests-deps.sh b/scripts/e2e/install-e2e-tests-deps.sh
deleted file mode 100644 (file)
index b05cef0..0000000
--- a/scripts/e2e/install-e2e-tests-deps.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-set -ex
-
-if [[ ! $(arch) =~ (i386|x86_64|amd64) ]]; then
-    # google chrome is only available on amd64
-    exit
-fi
-
-if grep -q  debian /etc/*-release; then
-    sudo bash -c 'echo "deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list'
-    curl -fsSL https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
-    sudo apt-get update
-    sudo apt-get install -y google-chrome-stable
-    sudo apt-get install -y python-requests python-openssl python-jinja2 python-jwt python-scipy
-    sudo rm /etc/apt/sources.list.d/google-chrome.list
-elif grep -q rhel /etc/*-release; then
-    sudo dd of=/etc/yum.repos.d/google-chrome.repo status=none <<EOF
-[google-chrome]
-name=google-chrome
-baseurl=https://dl.google.com/linux/chrome/rpm/stable/\$basearch
-enabled=1
-gpgcheck=1
-gpgkey=https://dl-ssl.google.com/linux/linux_signing_key.pub
-EOF
-    sudo yum install -y google-chrome-stable
-    sudo rm /etc/yum.repos.d/google-chrome.repo
-    sudo yum install -y python-requests pyOpenSSL python-jinja2 python-jwt scipy
-fi