Procházet zdrojové kódy

Merge "Add dogpile.cache master to the -src tests"

tags/3.5.0
Zuul před 6 měsíci
rodič
revize
bf5a206c08
3 změnil soubory, kde provedl 22 přidání a 5 odebrání
  1. 5
    4
      .zuul.yaml
  2. 14
    1
      devstack/plugin.sh
  3. 3
    0
      devstack/settings

+ 5
- 4
.zuul.yaml Zobrazit soubor

@@ -74,10 +74,11 @@
74 74
     parent: nodepool-functional-base
75 75
     run: playbooks/nodepool-functional-py35-src/run.yaml
76 76
     required-projects:
77
-      - openstack-infra/glean
78
-      - openstack-infra/nodepool
79
-      - openstack/diskimage-builder
80
-      - openstack/openstacksdk
77
+      - name: github.com/sqlalchemy/dogpile.cache
78
+      - name: openstack-infra/glean
79
+      - name: openstack-infra/nodepool
80
+      - name: openstack/diskimage-builder
81
+      - name: openstack/openstacksdk
81 82
 
82 83
 - job:
83 84
     name: nodepool-functional-py35-src

+ 14
- 1
devstack/plugin.sh Zobrazit soubor

@@ -42,7 +42,6 @@ function install_glean {
42 42
     fi
43 43
 }
44 44
 
45
-
46 45
 function install_openstacksdk {
47 46
     if use_library_from_git "openstacksdk"; then
48 47
         git_clone_by_name "openstacksdk"
@@ -50,6 +49,19 @@ function install_openstacksdk {
50 49
     fi
51 50
 }
52 51
 
52
+function install_dogpile_cache {
53
+    if use_library_from_git "dogpile.cache"; then
54
+        GITREPO["dogpile.cache"]=$DOGPILE_CACHE_REPO_URL
55
+        GITDIR["dogpile.cache"]=$DEST/dogpile.cache
56
+        GITBRANCH["dogpile.cache"]=$DOGPILE_CACHE_REPO_REF
57
+
58
+
59
+        git_clone_by_name "dogpile.cache"
60
+        $NODEPOOL_INSTALL/bin/pip install $DEST/dogpile.cache
61
+    fi
62
+}
63
+
64
+
53 65
 # Install nodepool code
54 66
 function install_nodepool {
55 67
     VENV="virtualenv -p python3"
@@ -64,6 +76,7 @@ function install_nodepool {
64 76
     # in the -src job we don't re-install from the requirement.
65 77
     # We should make this more resilient, probably using install-siblings.
66 78
     install_openstacksdk
79
+    install_dogpile_cache
67 80
     $NODEPOOL_INSTALL/bin/pbr freeze
68 81
 }
69 82
 

+ 3
- 0
devstack/settings Zobrazit soubor

@@ -23,6 +23,9 @@ DISKIMAGE_BUILDER_REPO_REF=${DISKIMAGE_BUILDER_REPO_REF:-master}
23 23
 GLEAN_REPO_URL=${GLEAN_REPO_URL:-https://git.openstack.org/openstack/glean}
24 24
 GLEAN_REPO_REF=${GLEAN_REPO_REF:-master}
25 25
 
26
+DOGPILE_CACHE_REPO_URL=${DOGPILE_CACHE_REPO_URL:-https://github.com/sqlalchemy/dogpile.git}
27
+DOGPILE_CACHE_REPO_REF=${DOGPILE_CACHE_REPO_REF:-master}
28
+
26 29
 enable_service geard
27 30
 enable_service statsd
28 31
 enable_service nodepool-launcher

Načítá se…
Zrušit
Uložit