Merge pull request #157 from galaxyproject/add_github_action

Added github action for tests and use cloudbridge full package

.github/workflows/tests.yaml

@@ -0,0 +1,27 @@
+name: Run tests
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+jobs:
+  build:
+    name: tests
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+    steps:
+      - name: 'Set up Python'
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.8'
+      - uses: actions/checkout@v2
+      - run: pip install tox
+      - run: pip install tox-docker>=2.0.0a3
+      - run: pip install coveralls
+      - run: tox -e py38-integration
+      - run: coveralls -v --service=github
+        env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.rst

@@ -1,13 +1,13 @@
 CloudMan is a cloud infrastructure and application manager, primarily for Galaxy.
 
+.. image:: https://github.com/galaxyproject/cloudman/actions/workflows/tests.yaml/badge.svg
+   :target: https://github.com/galaxyproject/cloudman/actions/workflows/tests.yaml
+   :alt: Github Build Status
+
 .. image:: https://coveralls.io/repos/github/galaxyproject/cloudman/badge.svg?branch=master
    :target: https://coveralls.io/github/galaxyproject/cloudman?branch=master
    :alt: Test Coverage Report
 
-.. image:: https://travis-ci.org/galaxyproject/cloudman.svg?branch=master
-   :target: https://travis-ci.org/galaxyproject/cloudman
-   :alt: Travis Build Status
-
 Installation
 ------------
 CloudMan is intended to be installed via the `CloudMan Helm chart`_.

cloudman/cloudman/urls.py

@@ -11,7 +11,7 @@
     1. Add an import:  from other_app.views import Home
     2. Add a URL to urlpatterns:  url(r'^$', Home.as_view(), name='home')
 Including another URLconf
-    1. Import the include() function: from django.conf.urls import url, include
+    1. Import the include() function: from django.urls import re_path, include
     2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
 """
 from django.conf import settings

cloudman/clusterman/tests/test_cluster_api.py

@@ -1301,7 +1301,7 @@ def test_scale_up_unschedulable(self):
         # Ensure that the created node has the correct size
         vm_types = self._get_cluster_node_vm_types(cluster_id)
         self.assertEqual(len(vm_types), 1)
-        self.assertTrue("i3en.24xlarge" in vm_types)
+        self.assertTrue("i3en.24xlarge" in vm_types or 'dl1.24xlarge' in vm_types)
 
     def test_scale_up_allowed_vm_types(self):
         # create the parent cluster

cloudman/clusterman/urls.py

@@ -1,7 +1,7 @@
 """CloudMan Create URL configuration."""
 
-from django.conf.urls import include
-from django.conf.urls import url
+from django.urls import include
+from django.urls import re_path
 
 from . import views
 from djcloudbridge.drf_routers import HybridDefaultRouter
@@ -28,6 +28,6 @@
 
 cluster_regex_pattern = r'^'
 urlpatterns = [
-    url(r'^', include(router.urls)),
-    url(cluster_regex_pattern, include(cluster_router.urls))
+    re_path(r'^', include(router.urls)),
+    re_path(cluster_regex_pattern, include(cluster_router.urls))
 ]

cloudman/helmsman/urls.py

@@ -1,7 +1,7 @@
 """CloudMan Create URL configuration."""
 
-from django.conf.urls import include
-from django.conf.urls import url
+from django.urls import include
+from django.urls import re_path
 
 from . import views
 from djcloudbridge.drf_routers import HybridDefaultRouter
@@ -20,5 +20,5 @@
 app_name = "helmsman"
 
 urlpatterns = [
-    url(r'^', include(router.urls)),
+    re_path(r'^', include(router.urls)),
 ]

cloudman/projman/urls.py

@@ -1,7 +1,7 @@
 """CloudMan Create URL configuration."""
 
-from django.conf.urls import include
-from django.conf.urls import url
+from django.urls import include
+from django.urls import re_path
 
 from . import views
 
@@ -22,6 +22,6 @@
 
 cluster_regex_pattern = r'^'
 urlpatterns = [
-    url(r'^', include(router.urls)),
-    url(cluster_regex_pattern, include(project_router.urls))
+    re_path(r'^', include(router.urls)),
+    re_path(cluster_regex_pattern, include(project_router.urls))
 ]

requirements_test.txt

@@ -5,11 +5,12 @@ paramiko
 sqlalchemy
 # required by moto
 sshpubkeys
-git+https://github.com/CloudVE/moto@fix_unknown_instance_type
-git+https://github.com/CloudVE/cloudbridge
+git+https://github.com/CloudVE/cloudbridge#egg=cloudbridge[dev]
 git+https://github.com/CloudVE/djcloudbridge
 # Leave cloudlaunch-cli before cloudlaunch-server due to coreapi version mismatch
 git+https://github.com/CloudVE/cloudlaunch-cli
 git+https://github.com/galaxyproject/cloudlaunch
+pytz>=2022.2.1
+tzdata>=2022.2
 -r requirements.txt
 -e ".[test]"