!19 [sync] PR-18: modify spec for aops-web build and fix issues

From: @openeuler-sync-bot
Reviewed-by: @solarhu
Signed-off-by: @solarhu
This commit is contained in:
openeuler-ci-bot 2021-09-15 15:18:54 +00:00 committed by Gitee
commit a470d39165
2 changed files with 111080 additions and 12 deletions

File diff suppressed because one or more lines are too long

View File

@ -1,13 +1,13 @@
#needsrootforbuild
Name: A-Ops Name: A-Ops
Version: v1.0.2 Version: v1.0.2
Release: 2 Release: 3
Summary: The intelligent ops toolkit for openEuler Summary: The intelligent ops toolkit for openEuler
License: MulanPSL2 License: MulanPSL2
URL: https://gitee.com/openeuler/A-Ops URL: https://gitee.com/openeuler/A-Ops
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
Source1: A-Ops-web-node-modules.tar.gz Source1: A-Ops-web-node-modules.tar.gz
patch0001: 0001-modify-deploymanager-ansible-playbook.patch patch0001: 0001-modify-deploymanager-ansible-playbook.patch
patch0002: 0002-fix-issue-for-the-4th-test.patch
# build for gopher # build for gopher
BuildRequires: cmake gcc-c++ yum elfutils-devel clang >= 10.0.1 llvm libconfig-devel BuildRequires: cmake gcc-c++ yum elfutils-devel clang >= 10.0.1 llvm libconfig-devel
@ -21,7 +21,7 @@ BuildRequires: git python3-devel systemd
BuildRequires: python3-setuptools python3-kafka-python python3-connexion BuildRequires: python3-setuptools python3-kafka-python python3-connexion
# build for web # build for web
BuildRequires: nodejs node-gyp npm BuildRequires: nodejs node-gyp nodejs-yarn
%description %description
The intelligent ops toolkit for openEuler The intelligent ops toolkit for openEuler
@ -170,15 +170,6 @@ website for A-Ops, deployed by Nginx
%patch0001 -p1 %patch0001 -p1
cp -r A-Ops-web-node-modules/node_modules aops-web/ cp -r A-Ops-web-node-modules/node_modules aops-web/
# prepare for web
pushd aops-web
npm config set registry https://mirrors.huaweicloud.com/repository/npm/
npm cache clean -f
npm install --global yarn
yarn config set registry https://mirrors.huaweicloud.com/repository/npm
popd
%build %build
# build for aops-utils # build for aops-utils
pushd aops-utils pushd aops-utils
@ -496,6 +487,9 @@ fi
%changelog %changelog
* Mon Sep 13 2021 chemingdao<chemingdao@huawei.com> - v1.0.2-3
- modify spec for aops-web build and fix some issues.
* Tue Sep 11 2021 yangyunyi<yangyunyi2@huawei.com> - v1.0.2-2 * Tue Sep 11 2021 yangyunyi<yangyunyi2@huawei.com> - v1.0.2-2
- modify ansible playbook - modify ansible playbook