diff --git a/Makefile b/Makefile index 042f55e7a9..9f34ae71ef 100755 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ NOSE_ARGS ?= --stop ZIP_TYPE := $(shell if [ "$(ZIP_DEV)" == "true" ]; then echo '-dev'; else echo ''; fi) -all: copr-rpms rpms +all: copr-rpms rpms iml-gui-rpm local: $(MAKE) RPM_DIST="0.$(shell date '+%s')" all diff --git a/vagrant/scripts/install_iml_local.sh b/vagrant/scripts/install_iml_local.sh index f88adb2c29..182bd035a6 100644 --- a/vagrant/scripts/install_iml_local.sh +++ b/vagrant/scripts/install_iml_local.sh @@ -107,6 +107,29 @@ gpgkey=https://download.copr.fedorainfracloud.org/results/managerforlustre/build repo_gpgcheck=0 enabled=1 enabled_metadata=1 + +[nodesource] +name=Node.js Packages for Enterprise Linux 7 - $basearch +baseurl=https://rpm.nodesource.com/pub_12.x/el/7/$basearch +failovermethod=priority +enabled=1 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL + +[nodesource-source] +name=Node.js for Enterprise Linux 7 - $basearch - Source +baseurl=https://rpm.nodesource.com/pub_12.x/el/7/SRPMS +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL +gpgcheck=1 + +[yarn] +name=Yarn Repository +baseurl=https://dl.yarnpkg.com/rpm/ +enabled=1 +gpgcheck=0 +gpgkey=https://dl.yarnpkg.com/rpm/pubkey.gpg """ EOF @@ -119,8 +142,8 @@ rm -rf /tmp/iml/_topdir/ su -l mocker << EOF mock -r /etc/mock/iml.cfg --init mock -r /etc/mock/iml.cfg --copyin /integrated-manager-for-lustre /iml -mock -r /etc/mock/iml.cfg -i cargo git ed epel-release python-setuptools gcc openssl-devel postgresql96-devel python2-devel python2-setuptools ed -mock -r /etc/mock/iml.cfg --shell 'export CARGO_HOME=/tmp/.cargo CARGO_TARGET_DIR=/tmp/target && cd /iml && make local' +mock -r /etc/mock/iml.cfg -i cargo git ed epel-release python-setuptools gcc openssl-devel postgresql96-devel python2-devel python2-setuptools ed yum +mock -r /etc/mock/iml.cfg --shell 'export CARGO_HOME=/tmp/.cargo CARGO_TARGET_DIR=/tmp/target PATH=$PATH:/tmp/.cargo/bin && cd /iml && make local' mock -r /etc/mock/iml.cfg --copyout /iml/_topdir /tmp/iml/_topdir mock -r /etc/mock/iml.cfg --copyout /iml/chroma_support.repo /tmp/iml/ EOF @@ -130,7 +153,8 @@ mkdir -p /tmp/{manager,agent}-rpms cp /tmp/iml/_topdir/RPMS/rust-iml-{action-runner,agent-comms,api,cli,config-cli,mailbox,ntp,ostpool,postoffice,sfa,stats,device,warp-drive}-*.rpm /tmp/manager-rpms/ cp /tmp/iml/_topdir/RPMS/python2-iml-manager-*.rpm /tmp/manager-rpms/ -cp /tmp/iml/_topdir/RPMS/rust-iml-agent-[0-9]*.rpm /tmp/agent-rpms +cp /tmp/iml/_topdir/RPMS/rust-iml-gui-[0-9]*.rpm /tmp/manager-rpms/ +cp /tmp/iml/_topdir/RPMS/rust-iml-agent-[0-9]*.rpm /tmp/agent-rpms/ cp /tmp/iml/chroma_support.repo /etc/yum.repos.d/ yum install -y /tmp/manager-rpms/*.rpm