diff options
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | ci/barometer-build.sh | 4 | ||||
| -rw-r--r-- | ci/utility/rpms_list | 9 |
3 files changed, 3 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5feacd04..e07d405d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -117,8 +117,8 @@ barometer-daily: script: - !reference [.gsutil-install, script] - cd ci/ - - ./barometer-build.sh - - ./barometer-upload-artifact.sh + - . barometer-build.sh + - . barometer-upload-artifact.sh rules: - if: $CI_PIPELINE_SOURCE == "schedule" && $BAROMETER_SCHEDULE == "true" diff --git a/ci/barometer-build.sh b/ci/barometer-build.sh index 04bbd263..ded45187 100644 --- a/ci/barometer-build.sh +++ b/ci/barometer-build.sh @@ -1,6 +1,6 @@ # This script is used by the barometer-daily CI job in gitlab. # It builds and packages collectd as an RPM -# After this script is run, the baroemter-daily job runs the +# After this script is run, the barometer-daily job runs the # barometer-upload-artifact.sh script. set -x @@ -12,11 +12,9 @@ echo "Starting the build of Barometer RPMs" echo "------------------------------------" echo -cd ci ./install_dependencies.sh ./build_rpm.sh cp utility/rpms_list $WORKSPACE -cd $WORKSPACE # save information regarding artifact into file ( diff --git a/ci/utility/rpms_list b/ci/utility/rpms_list index 9607c5ab..eda3f435 100644 --- a/ci/utility/rpms_list +++ b/ci/utility/rpms_list @@ -15,8 +15,6 @@ collectd-debuginfo collectd-disk collectd-dns collectd-email -collectd-gmond -collectd-gps collectd-hddtemp collectd-intel_rdt collectd-ipmi @@ -24,34 +22,27 @@ collectd-iptables collectd-java collectd-log_logstash collectd-lua -collectd-lvm collectd-memcachec -collectd-modbus -collectd-mqtt collectd-mysql collectd-netlink collectd-nginx collectd-notify_desktop collectd-notify_email -collectd-nut collectd-openldap collectd-ovs_events collectd-ovs_stats collectd-perl collectd-php-collection collectd-pinba -collectd-ping collectd-postgresql collectd-python collectd-redis collectd-rrdcached collectd-rrdtool collectd-sensors -collectd-smart collectd-snmp collectd-snmp_agent collectd-utils -collectd-varnish collectd-virt collectd-write_http collectd-write_prometheus |