From c24caf517f5365158a1af0c8ca571cab97617fad Mon Sep 17 00:00:00 2001 From: Michal Arbet Date: Fri, 24 Jan 2020 11:32:35 +0100 Subject: [PATCH] Add xstatic-** projects for vitrage-dashboard Current vitrage-dashboard repo has multiple embedded js copies. However these embeded js copies are not allowed by Horizon's official contributor guide. This change aimes to make these js copies to xstatic packages which can be installed by pip and remove all of embedded js copies from vitrage-dashboard repo. Change-Id: I92fef30261a4c17523682fe9c9b3483a759cf500 Needed-By: Ic5506ed6831454b222984f859f829de3cdd6f95c --- .../vitrage-dashboard-xstatic.config | 14 +++++++++++ gerrit/projects.yaml | 24 +++++++++++++++++++ gerritbot/channels.yaml | 6 +++++ zuul/main.yaml | 6 +++++ 4 files changed, 50 insertions(+) create mode 100644 gerrit/acls/openstack/vitrage-dashboard-xstatic.config diff --git a/gerrit/acls/openstack/vitrage-dashboard-xstatic.config b/gerrit/acls/openstack/vitrage-dashboard-xstatic.config new file mode 100644 index 0000000000..7e43d8a760 --- /dev/null +++ b/gerrit/acls/openstack/vitrage-dashboard-xstatic.config @@ -0,0 +1,14 @@ +[access "refs/heads/*"] +abandon = group vitrage-dashboard-core +abandon = group xstatic-core +label-Code-Review = -2..+2 group vitrage-dashboard-core +label-Code-Review = -2..+2 group xstatic-core +label-Workflow = -1..+1 group vitrage-dashboard-core +label-Workflow = -1..+1 group xstatic-core + +[receive] +requireChangeId = true +requireContributorAgreement = true + +[submit] +mergeContent = true diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index 569ef53e8a..2ca4f3990c 100644 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -5460,12 +5460,24 @@ - project: openstack/xstatic-d3 description: D3 JavaScript library packaged as XStatic. acl-config: /home/gerrit2/acls/openstack/xstatic.config +- project: openstack/xstatic-dagre + description: Dagre JavaScript library packaged as XStatic. + upstream: https://github.com/keuko/xstatic-dagre.git + acl-config: /home/gerrit2/acls/openstack/vitrage-dashboard-xstatic.config +- project: openstack/xstatic-dagre-d3 + description: Dagre-D3 JavaScript library packaged as XStatic. + upstream: https://github.com/keuko/xstatic-dagre-d3.git + acl-config: /home/gerrit2/acls/openstack/vitrage-dashboard-xstatic.config - project: openstack/xstatic-filesaver description: FileSaver JavaScript library packaged as XStatic. acl-config: /home/gerrit2/acls/openstack/xstatic.config - project: openstack/xstatic-font-awesome description: An icon font for web pages packaged as XStatic. acl-config: /home/gerrit2/acls/openstack/xstatic.config +- project: openstack/xstatic-graphlib + description: Graphlib JavaScript library packaged as XStatic. + upstream: https://github.com/keuko/xstatic-graphlib.git + acl-config: /home/gerrit2/acls/openstack/vitrage-dashboard-xstatic.config - project: openstack/xstatic-hogan description: Hogan JavaScript library packaged as XStatic. acl-config: /home/gerrit2/acls/openstack/xstatic.config @@ -5490,12 +5502,24 @@ - project: openstack/xstatic-json2yaml description: JSON to YAML converter JavaScript library packaged as XStatic. acl-config: /home/gerrit2/acls/openstack/xstatic.config +- project: openstack/xstatic-lodash + description: Lodash JavaScript library packaged as XStatic. + upstream: https://github.com/keuko/xstatic-lodash.git + acl-config: /home/gerrit2/acls/openstack/vitrage-dashboard-xstatic.config - project: openstack/xstatic-magic-search description: AngularJS widget that provides faceted and text search acl-config: /home/gerrit2/acls/openstack/xstatic.config - project: openstack/xstatic-mdi description: Google Material Design Icons packaged as XStatic. acl-config: /home/gerrit2/acls/openstack/xstatic.config +- project: openstack/xstatic-moment + description: Moment JavaScript library packaged as XStatic. + upstream: https://github.com/keuko/xstatic-moment.git + acl-config: /home/gerrit2/acls/openstack/vitrage-dashboard-xstatic.config +- project: openstack/xstatic-moment-timezone + description: Moment-Timezone JavaScript library packaged as XStatic. + upstream: https://github.com/keuko/xstatic-moment-timezone.git + acl-config: /home/gerrit2/acls/openstack/vitrage-dashboard-xstatic.config - project: openstack/xstatic-rickshaw description: Rickshaw JavaScript library packaged as XStatic. acl-config: /home/gerrit2/acls/openstack/xstatic.config diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml index ec189d340e..11d3d4c6a5 100755 --- a/gerritbot/channels.yaml +++ b/gerritbot/channels.yaml @@ -1848,6 +1848,12 @@ openstack-vitrage: - openstack/vitrage-dashboard - openstack/vitrage-specs - openstack/vitrage-tempest-plugin + - openstack/xstatic-dagre + - openstack/xstatic-dagre-d3 + - openstack/xstatic-graphlib + - openstack/xstatic-lodash + - openstack/xstatic-moment + - openstack/xstatic-moment-timezone branches: - master diff --git a/zuul/main.yaml b/zuul/main.yaml index a77cec1753..dad5a7be0e 100644 --- a/zuul/main.yaml +++ b/zuul/main.yaml @@ -1013,8 +1013,11 @@ - openstack/xstatic-bootstrap-scss - openstack/xstatic-bootswatch - openstack/xstatic-d3 + - openstack/xstatic-dagre + - openstack/xstatic-dagre-d3 - openstack/xstatic-filesaver - openstack/xstatic-font-awesome + - openstack/xstatic-graphlib - openstack/xstatic-hogan - openstack/xstatic-jasmine - openstack/xstatic-jquery-migrate @@ -1023,8 +1026,11 @@ - openstack/xstatic-js-yaml - openstack/xstatic-jsencrypt - openstack/xstatic-json2yaml + - openstack/xstatic-lodash - openstack/xstatic-magic-search - openstack/xstatic-mdi + - openstack/xstatic-moment + - openstack/xstatic-moment-timezone - openstack/xstatic-rickshaw - openstack/xstatic-roboto-fontface - openstack/xstatic-spin