From 05b20b7b545d7137cae45ace1b07d2dae5241f2f Mon Sep 17 00:00:00 2001 From: hbai Date: Wed, 20 Apr 2022 11:31:45 +0800 Subject: [PATCH] LAT: Modified the build directory to support different build types After this modifications, the yaml files and build output are placed into the independent folders: for 'std': /localdisk/lat/std for 'rt': /localdisk/lat/rt Story: 2008846 Task: 45092 Test Plan: Pass: build-image --std The created std image is under '/localdisk/lat/std/deploy/' The log is under '/localdisk/lat/std/log/' Pass: build-image --rt The created rt image is under '/localdisk/lat/rt/deploy/' The log is under '/localdisk/lat/rt/log/' Signed-off-by: hbai Change-Id: I0405f1d7d9bd55bfc6dfc1049060db98aa30799c --- .../config/debian/distro/stx-rt.lst | 1034 ++++++++++++++++- stx/toCOPY/lat-tool/lat/latc | 6 +- stx/toCOPY/lat-tool/lat/latd | 4 + stx/toCOPY/lat-tool/lat/volume.py | 4 +- 4 files changed, 1043 insertions(+), 5 deletions(-) diff --git a/debian-mirror-tools/config/debian/distro/stx-rt.lst b/debian-mirror-tools/config/debian/distro/stx-rt.lst index a3bb8e99e..fb7b88d5f 100644 --- a/debian-mirror-tools/config/debian/distro/stx-rt.lst +++ b/debian-mirror-tools/config/debian/distro/stx-rt.lst @@ -1,3 +1,1035 @@ #StarlingX patched package's name -#Packages here will be built into rt image +#Packages here will be built into std image #dpkg + +#armada +armada + +#armada-helm-toolkit +#armada-helm-toolkit # only used for build + +#barbican +barbican-api +barbican-common +barbican-doc +barbican-keystone-listener +barbican-worker +python3-barbican + +# base-files-config +base-files-config + +#base-passwd +base-passwd-dbgsym +base-passwd + +#bash +bash-builtins-dbgsym +bash-builtins +bash-dbgsym +bash-doc +bash-static-dbgsym +bash-static +bash + +#build-info +#build-info-dev # not used +build-info + +#centos-debian-compat +centos-debian-compat + +#ceph +#ceph-base-dbgsym # debug symbols +ceph-base +#ceph-common-dbgsym # debug symbols +ceph-common +#ceph-fuse-dbgsym # debug symbols +ceph-fuse +#ceph-grafana-dashboards # not used +#ceph-mds-dbgsym # debug symbols +ceph-mds +#ceph-mgr-dashboard # not used +#ceph-mgr-dbgsym # debug symbols +#ceph-mgr-diskprediction-cloud # not used +#ceph-mgr-diskprediction-local # not used +#ceph-mgr-k8sevents # not used +#ceph-mgr-rook # not used +#ceph-mgr-ssh # not used +ceph-mgr +#ceph-mon-dbgsym # debug symbols +ceph-mon +#ceph-osd-dbgsym # debug symbols +ceph-osd +#ceph-resource-agents # not used +ceph +#cephfs-shell # not used +#libcephfs-dev # not used +#libcephfs-java # not used +#libcephfs-jni-dbgsym # debug symbols +#libcephfs-jni # not used +#libcephfs2-dbgsym # debug symbols +libcephfs2 +#librados-dev-dbgsym # debug symbols +#librados-dev # not used +#librados2-dbgsym # debug symbols +librados2 +#libradospp-dev # not used +#libradosstriper-dev # not used +#libradosstriper1-dbgsym # debug symbols +libradosstriper1 +#librbd-dev # not used +#librbd1-dbgsym # debug symbols +librbd1 +#librgw-dev # not used +#librgw2-dbgsym # debug symbols +librgw2 +python3-ceph-argparse +python3-ceph +#python3-cephfs-dbgsym # debug symbols +python3-cephfs +#python3-rados-dbgsym # debug symbols +python3-rados +#python3-rbd-dbgsym # debug symbols +python3-rbd +#python3-rgw-dbgsym # debug symbols +python3-rgw +#rados-objclass-dev # not used +#radosgw-dbgsym # debug symbols +radosgw +#rbd-fuse-dbgsym # debug symbols +#rbd-fuse # not used +#rbd-mirror-dbgsym # debug symbols +#rbd-mirror # not used +#rbd-nbd-dbgsym # debug symbols +#rbd-nbd # not used + +#ceph-manager +#ceph-manager-wheels # not used in deployment +ceph-manager + +#cert-alarm +cert-alarm + +#cert-manager-helm +cert-manager-helm + +#cert-mon +cert-mon + +#cgcs-patch +cgcs-patch-agent +cgcs-patch-controller +cgcs-patch +python3-cgcs-patch + +#cgts-client +cgts-client-wheel +cgts-client + +#chartmuseum +#chartmuseum # only used for build + +#cluster-resource-agents +#ldirectord # not used +resource-agents-dbgsym +resource-agents + +#collector +collector + +#config-gate +config-gate-worker +config-gate + +#containerd +containerd-dbgsym +containerd +#golang-github-containerd-containerd-dev # not used + +#controllerconfig +controllerconfig-wheels +controllerconfig + +#crictl +crictl + +#debian-integration +debian-integration + +#debian-release-config +debian-release-config + +#dex-helm +#dex-helm # only used for build + +#dhcp +isc-dhcp-client-dbgsym +#isc-dhcp-client-ddns-dbgsym # not used +#isc-dhcp-client-ddns # not used +isc-dhcp-client +isc-dhcp-common +#isc-dhcp-dev # not used +#isc-dhcp-relay-dbgsym # not used +#isc-dhcp-relay # not used +#isc-dhcp-server-dbgsym # not used +#isc-dhcp-server-ldap-dbgsym # not used +#isc-dhcp-server-ldap # not used +#isc-dhcp-server # not used + +#dhcp-config +dhcp-config + +#distributedcloud +distributedcloud-dccommon +distributedcloud-dcdbsync +distributedcloud-dcmanager +distributedcloud-dcorch +distributedcloud-wheels + +#distributedcloud-client +distributedcloud-client-dcmanagerclient +distributedcloud-client-wheels + +#dnsmasq +#dnsmasq-base-lua # not used +dnsmasq-base +dnsmasq-utils +dnsmasq + +#dnsmasq-config +dnsmasq-config + +#docker-config +docker-config + +#docker-distribution +docker-registry +#golang-github-docker-distribution-dev # not used + +#drbd-tools +drbd-utils-dbgsym +drbd-utils + +#enable-dev-patch +#enable-dev-patch # not used in deployment + +#etcd +etcd-client +etcd-server-dbgsym +etcd-server +etcd +#golang-etcd-server-dev # not used + +#facter +facter-dbgsym +#facter-dev # not used +facter +libfacter3.14.12-dbgsym +libfacter3.14.12 + +#fm-api +python3-fm-api + +#fm-common +fm-common-dbgsym +#fm-common-dev # not used +fm-common-doc +fm-common + +#fm-doc +fm-doc + +#fm-mgr +fm-mgr-dbgsym +fm-mgr + +#fm-rest-api +fm-rest-api + +#golang-1.16.12 +#golang-1.16-doc # only used for build +#golang-1.16-go # only used for build +#golang-1.16-src # only used for build +#golang-1.16 # only used for build + +#golang-dep +#go-dep # only used for build + +#grub2 +#grub-common-dbgsym # not used +grub-common +#grub-coreboot-bin # not used +#grub-coreboot-dbg # not used +#grub-coreboot # not used +#grub-efi-amd64-bin # not used +#grub-efi-amd64-dbg # not used +#grub-efi-amd64-signed-template # not used +#grub-efi-amd64 # not used +#grub-efi-ia32-bin # not used +#grub-efi-ia32-dbg # not used +#grub-efi-ia32 # not used +#grub-efi # not used +#grub-emu-dbg # not used +#grub-emu # not used +#grub-firmware-qemu # not used +#grub-ieee1275-bin # not used +#grub-ieee1275-dbg # not used +#grub-ieee1275 # not used +#grub-linuxbios # not used +#grub-pc-bin-dbgsym # not used +grub-pc-bin +#grub-pc-dbg # not used +grub-pc +#grub-rescue-pc # not used +#grub-theme-starfield # not used +#grub-xen-bin # not used +#grub-xen-dbg # not used +#grub-xen-host # not used +#grub-xen # not used +grub2-common-dbgsym +grub2-common +grub2 + +#grubby +grubby-dbgsym +grubby + +#gui +starlingx-dashboard + +#helm +helm + +#hostdata-collectors +engtools + +#initramfs-ostree +#initramfs-ostree # only used for build + +#intel-i40e +i40e-rt + +#intel-iavf +iavf-rt + +#intel-ice +ice-rt + +#intel-igb_uio +igb-uio-rt + +#intel-opae-fpga +kmod-opae-fpga-driver-rt + +#isolcpus-device-plugin +isolcpus-device-plugin-dbgsym +isolcpus-device-plugin + +#k8s-pod-recovery +k8s-pod-recovery + +#kernel-std +#bpftool-dbgsym # not used +#bpftool # not used +#hyperv-daemons-dbgsym # not used +#hyperv-daemons # not used +#libcpupower-dev # not used +#libcpupower1-dbgsym # not used +#libcpupower1 # not used +linux-compiler-gcc-10-x86 +#linux-config-5.10 # not used +#linux-cpupower-dbgsym # not used +#linux-cpupower # not used +linux-rt-headers-5.10.0-6-amd64 +linux-rt-headers-5.10.0-6-common +#linux-image-5.10.0-6-amd64-dbg # not used +linux-rt-image-5.10.0-6-amd64-unsigned +#linux-image-amd64-dbg # not used +#linux-image-amd64-signed-template # not used +linux-rt-kbuild-5.10-dbgsym +linux-rt-kbuild-5.10 +linux-libc-dev +#linux-perf-5.10-dbgsym # not used +#linux-perf-5.10 # not used +#linux-perf # not used +#linux-source-5.10 # not used +#linux-source # not used +#linux-support-5.10.0-6 # not used +#usbip-dbgsym # not used +#usbip # not used + +# lvm2-config +lvm2-config + +#keyrings.alt +python3-keyrings.alt + +#keystone +keystone-doc +keystone +python3-keystone + +#kubernetes-1.21.8 +kubernetes-1.21.8-client +kubernetes-1.21.8-kubeadm +kubernetes-1.21.8-master +kubernetes-1.21.8-misc +kubernetes-1.21.8-node +#kubernetes-1.21.8-unit-test # not used + +#kubernetes-unversioned +kubernetes-unversioned + +#ldapscripts +ldapscripts + +#libfdt +libfdt-dbgsym +libfdt + +#lighttpd +lighttpd-dbgsym +#lighttpd-doc # not used +#lighttpd-mod-authn-gssapi-dbgsym # not used +#lighttpd-mod-authn-gssapi # not used +#lighttpd-mod-authn-pam-dbgsym # not used +#lighttpd-mod-authn-pam # not used +#lighttpd-mod-authn-sasl-dbgsym # not used +#lighttpd-mod-authn-sasl # not used +lighttpd-mod-geoip-dbgsym +lighttpd-mod-geoip +#lighttpd-mod-maxminddb-dbgsym # not used +#lighttpd-mod-maxminddb # not used +#lighttpd-mod-trigger-b4-dl-dbgsym # not used +#lighttpd-mod-trigger-b4-dl # not used +#lighttpd-mod-vhostdb-dbi-dbgsym # not used +#lighttpd-mod-vhostdb-dbi # not used +#lighttpd-mod-vhostdb-pgsql-dbgsym # not used +#lighttpd-mod-vhostdb-pgsql # not used +#lighttpd-mod-webdav-dbgsym # not used +#lighttpd-mod-webdav # not used +lighttpd-modules-mysql-dbgsym +lighttpd-modules-mysql +lighttpd + +#lighttpd-config +lighttpd-config + +#linuxptp +linuxptp-dbgsym +linuxptp + +#lldpd +#liblldpctl-dev # not used +lldpd-dbgsym +lldpd + +#logmgmt +logmgmt-wheels +logmgmt + +#lsb +lsb-base +#lsb-release # not used + +#mlnx-ofa_kernel +mlnx-ofed-kernel-modules-rt +mlnx-ofed-kernel-utils-rt + +#monitor-helm +#monitor-helm # only used for build + +#monitor-helm-elastic +#monitor-helm-elastic # only used for build + +#mtce +mtce-dbgsym +#mtce-dev # not used +mtce-hostw-dbgsym +mtce-hostw +mtce-hwmon-dbgsym +mtce-hwmon +mtce-lmon-dbgsym +mtce-lmon +mtce-pmon-dbgsym +mtce-pmon +mtce + +#mtce-common +#mtce-common-dev # not used + +#mtce-compute +mtce-compute + +#mtce-control +mtce-control + +#mtce-guest +mtce-guest-agent-dbgsym +mtce-guest-agent +mtce-guest-server-dbgsym +mtce-guest-server + +#mtce-storage +mtce-storage + +#mttyexec +#mttyexec-dbgsym # not used +#mttyexec # only used for build + +#namespace-utils +namespace-utils-dbgsym +namespace-utils + +#net-tools +net-tools-dbgsym +net-tools + +#nfscheck +nfscheck + +#nfv +nfv-client +nfv-common +nfv-plugins +nfv-tools +nfv-vim +nfv-wheels + +#nova-api-proxy +nova-api-proxy-wheels +nova-api-proxy + +#oidc-auth-tools +#python3-oidcauthtools-wheels # installed by app framework +#python3-oidcauthtools # not used + +#openldap +ldap-utils-dbgsym +ldap-utils +libldap-2.4-2-dbgsym +libldap-2.4-2 +libldap-common +#libldap2-dev # not used +#slapd-contrib-dbgsym # not used +#slapd-contrib # not used +slapd-dbgsym +#slapd-smbk5pwd # not used +slapd +#slapi-dev # not used +slapd-ppolicy-check-password + +#openldap-config +openldap-config + +#openstack-helm +#openstack-helm # only used for build + +#openstack-helm-infra +#openstack-helm-infra # only used for build + +#openstack-pkg-tools +#openstack-pkg-tools # only used for build + +#openstack-ras +openstack-resource-agents + +#ostree +#gir1.2-ostree-1.0 # only used for build +#libostree-1-1-dbgsym # only used for build +#libostree-1-1 # only used for build +#libostree-dev # only used for build +#libostree-doc # only used for build +#ostree-boot-dbgsym # only used for build +#ostree-boot # only used for build +#ostree-dbgsym # only used for build +#ostree-tests-dbgsym # only used for build +#ostree-tests # only used for build +#ostree # only used for build + +#ostree-upgrade-mgr +#ostree-upgrade-mgr # only used for build + +#pam-config +#pam-config # integration issue + +#parted +#libparted-dev # not used +libparted-fs-resize0-dbgsym +libparted-fs-resize0 +libparted-i18n +libparted2-dbgsym +libparted2 +parted-dbgsym +parted-doc +parted + +#patch-alarm +#python3-patch-alarm-wheels # not used in deployment +python3-patch-alarm + +#pci-irq-affinity-agent +pci-irq-affinity-agent + +#pf-bb-config +pf-bb-config + +#platform-util +platform-util-controller +platform-util-noncontroller +platform-util-wheel +platform-util +python3-platform-util + +platform-kickstarts + +#playbookconfig +playbookconfig + +#plugins +bond-cni +containernetworking-plugins +#golang-github-containernetworking-plugins-dev # not used + +#portieris-helm +#portieris-helm # only used for build + +#puppet-5.5.22 +#puppet-master-passenger # not used +puppet-master +puppet + +#puppet-boolean-2.0.2 +puppet-boolean + +#puppet-ceph-3.1.1 +puppet-module-ceph + +#puppet-dcdbsync +puppet-dcdbsync + +#puppet-dcmanager +puppet-dcmanager + +#puppet-dcorch +puppet-dcorch + +#puppet-dnsmasq +puppet-dnsmasq + +#puppet-drbd-0.5.2 +puppet-drbd + +#puppet-etcd-1.12.3 +puppet-module-cristifalcas-etcd + +#puppet-fm +puppet-fm + +#puppet-keystone-17.4.0 +puppet-module-keystone + +#puppet-ldap +puppet-ldap + +#puppet-lvm-1.4.0 +puppet-lvm + +#puppet-manifests +puppet-manifests + +#puppet-mtce +puppet-mtce + +#puppet-network +puppet-network + +#puppet-nfv +puppet-nfv + +#puppet-nslcd +puppet-nslcd + +#puppet-openstacklib-17.4.0 +puppet-module-openstacklib + +#puppet-oslo-17.4.0 +puppet-module-oslo + +#puppet-patching +puppet-patching + +#puppet-puppi +puppet-puppi + +#puppet-rabbitmq-8.5.0 +puppet-module-puppetlabs-rabbitmq + +#puppet-smapi +puppet-smapi + +#puppet-sshd +puppet-sshd + +#puppet-staging +puppet-module-nanliu-staging + +#puppet-sysinv +puppet-sysinv + +#puppetlabs-haproxy-2.1.0 +puppet-module-puppetlabs-haproxy + +#puppetlabs-postgresql-6.7.0 +puppet-module-puppetlabs-postgresql + +#puppetlabs-stdlib-5.0.0 +puppet-module-puppetlabs-stdlib + +#pxe-network-installer +pxe-network-installer + +#python-aodhclient +python-aodhclient-doc +#python3-aodhclient-wheel # not used in deployment +python3-aodhclient + +#python-barbicanclient +#python3-barbicanclient-wheel # not used in deployment +python3-barbicanclient + +#python-cephclient +python3-cephclient + +#python-cinderclient +python3-cinderclient + +#python-docker +python3-docker + +#python-fmclient +python3-fmclient + +#python-glanceclient +python-glanceclient-doc +#python3-glanceclient-wheel # not used in deployment +python3-glanceclient + +#python-gnocchiclient +python-gnocchiclient-doc +#python3-gnocchiclient-wheel # not used in deployment +python3-gnocchiclient + +#python-heatclient +#python3-heatclient-wheel # not used in deployment +python3-heatclient + +#python-horizon +horizon-doc +openstack-dashboard-apache +openstack-dashboard +python3-django-horizon + +#python-ironicclient +python-ironicclient-doc +#python3-ironicclient-wheel # not used in deployment +python3-ironicclient + +#python-k8sapp-auditd +#python3-k8sapp-auditd-wheels # installed by app framework +#python3-k8sapp-auditd # not used + +#python-k8sapp-cert-manager +#python3-k8sapp-cert-manager-wheels # installed by app framework +#python3-k8sapp-cert-manager # not used + +#python-k8sapp-nginx-ingress-controller +#python3-k8sapp-nginx-ingress-controller-wheels # installed by app framework +#python3-k8sapp-nginx-ingress-controller # not used + +#python-k8sapp-oidc +#python3-k8sapp-oidc-wheels # installed by app framework +#python3-k8sapp-oidc # not used + +#python-k8sapp-openstack +#python3-k8sapp-openstack-wheels # installed by app framework +#python3-k8sapp-openstack # not used + +#python-k8sapp-platform +#python3-k8sapp-platform-wheels # installed by app framework +#python3-k8sapp-platform # not used + +#python-k8sapp-portieris +#python3-k8sapp-portieris-wheels # installed by app framework +#python3-k8sapp-portieris # not used + +#python-k8sapp-ptp-notification +#python3-k8sapp-ptp-notification-wheels # installed by app framework +#python3-k8sapp-ptp-notification # not used + +#python-k8sapp-snmp +#python3-k8sapp-snmp-wheels # installed by app framework +#python3-k8sapp-snmp # not used + +#python-k8sapp-vault +#python3-k8sapp-vault-wheels # installed by app framework +#python3-k8sapp-vault # not used + +#python-keyring +python3-keyring + +#python-keystoneclient +python-keystoneclient-doc +#python3-keystoneclient-wheel # not used in deployment +python3-keystoneclient + +#python-neutronclient +#python3-neutronclient-wheel # not used in deployment +python3-neutronclient + +#python-novaclient +python-novaclient-doc +#python3-novaclient-wheel # not used in deployment +python3-novaclient + +#python-openstackclient +python-openstackclient-doc +#python3-openstackclient-wheel # not used in deployment +python3-openstackclient + +#python-openstacksdk +python-openstacksdk-doc +#python3-openstacksdk-wheel # not used in deployment +python3-openstacksdk + +#python-osc-lib +python-osc-lib-doc +python3-osc-lib + +#python-oslo-messaging +python3-oslo.messaging + +#python-pankoclient +python-pankoclient-doc +#python3-pankoclient-wheel # not used in deployment +python3-pankoclient + +#python-wsme +python3-wsme + +#python3-setuptools +#python-setuptools-doc +python3-pkg-resources +python3-setuptools + +#qat17 +qat1.7.l-rt-dbgsym +qat1.7.l-rt + +#rabbitmq-server +rabbitmq-server + +#rabbitmq-server-config +rabbitmq-server-config + +#rdma-core +ibacm-dbgsym +ibacm +ibverbs-providers-dbgsym +ibverbs-providers +ibverbs-utils-dbgsym +ibverbs-utils +infiniband-diags-dbgsym +infiniband-diags +#libibmad-dev # not used +libibmad5-dbg +libibmad5 +#libibnetdisc-dev # not used +libibnetdisc5-dbg +libibnetdisc5 +#libibumad-dev # not used +libibumad3-dbg +libibumad3 +#libibverbs-dev # not used +libibverbs1-dbg +libibverbs1 +#librdmacm-dev # not used +librdmacm1-dbg +librdmacm1 +python3-pyverbs-dbgsym +python3-pyverbs +rdma-core-dbgsym +rdma-core +rdmacm-utils-dbgsym +rdmacm-utils +srptools-dbgsym +srptools + +#registry-token-server +registry-token-server + +#rsync-config +rsync-config + +#runc +#golang-github-opencontainers-runc-dev # not used +runc-dbgsym +runc + +#service-mgmt-api +sm-api-wheels +sm-api + +#service-mgmt-client +sm-client-wheels +sm-client + +#service-mgmt-tools +sm-tools-wheels +sm-tools + +#shadow-utils-config +shadow-utils-config + +#shim-unsigned +shim-helpers-amd64-signed-template +shim-unsigned + +#sm +sm-dbgsym +sm + +#sm-common +sm-common-dbgsym +#sm-common-dev # not used +sm-common-libs-dbgsym +sm-common-libs +sm-common +sm-eru-dbgsym +sm-eru + +#sm-db +sm-db-dbgsym +#sm-db-dev # not used +sm-db + +#storageconfig +#storageconfig # integration issue + +#stx-audit-helm +stx-audit-helm + +#stx-cert-manager-helm +stx-cert-manager-helm + +#stx-extensions +stx-extensions + +#stx-metrics-server-helm +stx-metrics-server-helm + +#stx-monitor-helm +#stx-monitor-helm # integration issue + +#stx-nginx-ingress-controller-helm +stx-nginx-ingress-controller-helm + +#stx-ocf-scripts +stx-ocf-scripts + +#stx-oidc-auth-helm +stx-oidc-auth-helm + +#stx-openstack-helm +stx-openstack-helm + +#stx-platform-helm +stx-platform-helm + +#stx-portieris-helm +stx-portieris-helm + +#stx-ptp-notification-helm +stx-ptp-notification-helm + +#stx-snmp-helm +stx-snmp-helm + +#stx-vault-helm +stx-vault-helm + +#sudo-config +sudo-config + +#sysinv +sysinv-wheels +sysinv + +#sysinv-agent +sysinv-agent + +#sysinv-fpga-agent +sysinv-fpga-agent + +#syslog-ng-config +syslog-ng-config + +#systemd +libnss-myhostname-dbgsym +libnss-myhostname +#libnss-mymachines-dbgsym # not used +#libnss-mymachines # not used +#libnss-resolve-dbgsym # not used +#libnss-resolve # not used +#libnss-systemd-dbgsym # not used +#libnss-systemd # not used +libpam-systemd-dbgsym +libpam-systemd +#libsystemd-dev # not used +libsystemd0-dbgsym +libsystemd0 +#libudev-dev # not used +libudev1-dbgsym +libudev1 +#systemd-container-dbgsym # not used +#systemd-container # not used +#systemd-coredump-dbgsym # not used +#systemd-coredump # not used +systemd-dbgsym +#systemd-journal-remote-dbgsym # not used +#systemd-journal-remote # not used +systemd-sysv +#systemd-tests-dbgsym # not used +#systemd-tests # not used +#systemd-timesyncd-dbgsym # not used +#systemd-timesyncd # not used +systemd +udev-dbgsym +udev + +#systemd-config +systemd-config + +#trident-installer +trident-installer + +#tsconfig +tsconfig-wheel +tsconfig + +#update-motd +update-motd + +#vault-helm +#vault-helm # only used for build + +#watchdog +watchdog-dbgsym +watchdog + +#worker-utils +worker-utils + +#workerconfig +#workerconfig-standalone # integration issue diff --git a/stx/toCOPY/lat-tool/lat/latc b/stx/toCOPY/lat-tool/lat/latc index c04db8795..e395ec2c1 100755 --- a/stx/toCOPY/lat-tool/lat/latc +++ b/stx/toCOPY/lat-tool/lat/latc @@ -43,6 +43,8 @@ def main(): parser.add_argument("-q", "--quiet", help = "Hide all output except error messages", action="store_const", const=logging.ERROR, dest="loglevel") + parser.add_argument("-t", "--kernel", type=str, choices=['std', 'rt'], default='std', + help = "Image type for standard kernel or rt kernel") parser.add_argument('action', metavar='action', type=str, nargs=1, help = 'Action to take. e.g. getyaml/build/status/stop/clean/logs') parser.add_argument('--file', required=False, @@ -53,12 +55,12 @@ def main(): client_action = args.action[0] - msg = {} + msg = {'workdir': os.path.join(channel.workspace_dir, args.kernel)} if client_action == 'getyaml': msg['action'] = 'getyaml' elif client_action == 'build': if not args.file: - logger.error('latc build --file /path/to/some.yaml') + logger.error('latc build --file /path/to/some.yaml -t std|rt') sys.exit(1) msg['action'] = 'build' if not os.path.exists(args.file): diff --git a/stx/toCOPY/lat-tool/lat/latd b/stx/toCOPY/lat-tool/lat/latd index e70daa4a0..479be52aa 100755 --- a/stx/toCOPY/lat-tool/lat/latd +++ b/stx/toCOPY/lat-tool/lat/latd @@ -60,9 +60,13 @@ class LATD(object): # record the message into history msg_hist = CHANNEL_DIR + "/client_message_history" record_message(msg_hist, message) + self.workspace_dir = message['workdir'] + logger.info("Set work directory to %s" % self.workspace_dir) if message['action'] == 'build': msg_latd = {} msg_latd['action'] = 'build' + cmd = 'rm -f log/log.appsdk' + subprocess.check_call(cmd, shell=True, cwd=self.workspace_dir) if 'yaml_file' in message: yaml_file = message['yaml_file'] diff --git a/stx/toCOPY/lat-tool/lat/volume.py b/stx/toCOPY/lat-tool/lat/volume.py index d825a354a..7b38e1f31 100644 --- a/stx/toCOPY/lat-tool/lat/volume.py +++ b/stx/toCOPY/lat-tool/lat/volume.py @@ -25,10 +25,10 @@ import yaml logger = logging.getLogger('latd.volume') -workspace_dir = "/localdisk" if 'WORKSPACE_DIR' not in os.environ \ +workspace_dir = "/localdisk/lat" if 'WORKSPACE_DIR' not in os.environ \ else os.environ['WORKSPACE_DIR'] -channel_dir = workspace_dir + "/channel" +channel_dir = "/localdisk/channel" client_message_watch_file = channel_dir + "/c-2-s.done" client_message_content_file = channel_dir + "/c-2-s.msg"