diff options
Diffstat (limited to 'utils')
| -rwxr-xr-x | utils/artifacts.opnfv.org.sh | 8 | ||||
| -rw-r--r-- | utils/build-server-ansible/main.yml | 9 | ||||
| -rw-r--r-- | utils/build-server-ansible/vars/CentOS.yml | 22 | ||||
| -rw-r--r-- | utils/build-server-ansible/vars/Ubuntu.yml | 71 | ||||
| -rw-r--r-- | utils/build-server-ansible/vars/defaults.yml | 4 | ||||
| -rwxr-xr-x | utils/fetch_os_creds.sh | 41 | ||||
| -rwxr-xr-x | utils/gpg_import_key.sh | 14 | ||||
| -rw-r--r-- | utils/push-test-logs.sh | 16 |
8 files changed, 142 insertions, 43 deletions
diff --git a/utils/artifacts.opnfv.org.sh b/utils/artifacts.opnfv.org.sh index 1984b4992..2b35006d4 100755 --- a/utils/artifacts.opnfv.org.sh +++ b/utils/artifacts.opnfv.org.sh @@ -31,7 +31,7 @@ do for index in $(gsutil ls -l gs://artifacts.opnfv.org/logs/"$project"/ |awk 'NF==1'| sed s,gs://artifacts.opnfv.org/,, ) do index="$(echo ${index%/*} | sed s,/,_,g)" - echo "<LI><a href=\"http://artifacts.opnfv.org/${index%/*}.html\">"$index"</a></LI>" >> $OUTPUT + echo "<LI><a href=\"https://artifacts.opnfv.org/${index%/*}.html\">"$index"</a></LI>" >> $OUTPUT done done @@ -55,7 +55,7 @@ rm -f $OUTPUT echo "<LI>$path</LI>" >> $OUTPUT echo "</UL>" >> $OUTPUT else - echo "<LI><a href=\"http://artifacts.opnfv.org/$filepath\">"$filepath"</a></LI>" >> $OUTPUT + echo "<LI><a href=\"https://artifacts.opnfv.org/$filepath\">"$filepath"</a></LI>" >> $OUTPUT fi done @@ -85,7 +85,7 @@ rm -f $OUTPUT echo "<LI>$path</LI>" >> $OUTPUT echo "</UL>" >> $OUTPUT else - echo "<LI><a href=\"http://artifacts.opnfv.org/$filepath\">"$filepath"</a></LI>" >> $OUTPUT + echo "<LI><a href=\"https://artifacts.opnfv.org/$filepath\">"$filepath"</a></LI>" >> $OUTPUT fi done @@ -119,7 +119,7 @@ do echo "<LI>$path</LI>" >> $OUTPUT echo "</UL>" >> $OUTPUT else - echo "<LI><a href=\"http://artifacts.opnfv.org/$filepath\">"$filepath"</a></LI>" >> $OUTPUT + echo "<LI><a href=\"https://artifacts.opnfv.org/$filepath\">"$filepath"</a></LI>" >> $OUTPUT fi diff --git a/utils/build-server-ansible/main.yml b/utils/build-server-ansible/main.yml index 0fcce715d..a4d3b08cb 100644 --- a/utils/build-server-ansible/main.yml +++ b/utils/build-server-ansible/main.yml @@ -31,7 +31,16 @@ pip: name: tox state: present + - name: install yamllint + pip: + name: yamllint + state: present - include: vars/docker-compose-CentOS.yml when: ansible_distribution == "CentOS" - include: vars/docker-compose-Ubuntu.yml when: ansible_distribution == "Ubuntu" + - name: Install manifest-tool + get_url: + url: '{{ manifest_tool_url }}/{{ manifest_tool_version }}/manifest-tool-linux-amd64' + dest: '{{ manifest_tool_bin_dir }}/manifest-tool' + mode: '755' diff --git a/utils/build-server-ansible/vars/CentOS.yml b/utils/build-server-ansible/vars/CentOS.yml index 528388f27..50839be70 100644 --- a/utils/build-server-ansible/vars/CentOS.yml +++ b/utils/build-server-ansible/vars/CentOS.yml @@ -29,23 +29,25 @@ name: "{{ item }}" state: present with_items: - - python-pip - - rpm-build + - bc + - collectd + - doxygen + - facter + - jq - kernel-headers - libpcap-devel - - zlib-devel - - numactl-devel - - doxygen - - python-sphinx - libvirt-devel - - python-devel + - net-tools + - numactl-devel - openssl-devel + - python-devel + - python-pip - python-six - - net-tools - - bc + - python-sphinx + - rpm-build - sysstat - xmlstarlet - - facter + - zlib-devel - name: install the 'Development tools' package group yum: diff --git a/utils/build-server-ansible/vars/Ubuntu.yml b/utils/build-server-ansible/vars/Ubuntu.yml index e91c48569..bd77a4d10 100644 --- a/utils/build-server-ansible/vars/Ubuntu.yml +++ b/utils/build-server-ansible/vars/Ubuntu.yml @@ -59,6 +59,77 @@ - sysstat - xmlstarlet - facter + - jq + - python-tox + - collectd-dev + - python3 + - python3-dev + - libdpdk-dev + - dpdk-dev + - fakeroot + - devscripts + - debhelper + - dpkg-dev + - po-debconf + - dh-systemd + - dh-strip-nondeterminism + - autotools-dev + - libltdl-dev + - iptables-dev + - javahelper + - libatasmart-dev + - libcap-dev + - libcurl4-gnutls-dev + - libdbi0-dev + - libesmtp-dev + - libganglia1-dev + - libgcrypt11-dev + - libgps-dev + - libhiredis-dev + - libi2c-dev + - libldap2-dev + - liblua5.3-dev + - liblvm2-dev + - libmemcached-dev + - libmodbus-dev + - libmnl-dev + - libmosquitto-dev + - libmysqlclient-dev + - libnotify-dev + - libopenipmi-dev + - liboping-dev + - libow-dev + - libpcap0.8-dev + - libpcap-dev + - libperl-dev + - libpq-dev + - libprotobuf-c-dev + - libriemann-client-dev + - librdkafka-dev + - librabbitmq-dev + - librrd-dev + - libsensors4-dev + - libsigrok-dev + - libsnmp-dev + - libsnmp9-dev + - snmp + - snmp-mibs-downloader + - snmpd + - perl + - libtokyocabinet-dev + - libtokyotyrant-dev + - libudev-dev + - libupsclient-dev + - libvarnishapi-dev + - libvirt-dev + - libvirt-daemon + - libxen-dev + - libyajl-dev + - linux-libc-dev + - default-jdk + - protobuf-c-compiler + - openvswitch-switch + - mcelog - name: Add Docker apt key. apt_key: diff --git a/utils/build-server-ansible/vars/defaults.yml b/utils/build-server-ansible/vars/defaults.yml index 8d83380dd..ff37c953c 100644 --- a/utils/build-server-ansible/vars/defaults.yml +++ b/utils/build-server-ansible/vars/defaults.yml @@ -21,3 +21,7 @@ docker_yum_repo_url: https://download.docker.com/linux/centos/docker-ce.repo # yamllint enable rule:line-length docker_yum_repo_enable_edge: 0 docker_yum_repo_enable_test: 0 + +manifest_tool_version: 'v0.7.0' +manifest_tool_url: 'https://github.com/estesp/manifest-tool/releases/download' +manifest_tool_bin_dir: '/usr/local/bin' diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh index 4bc585885..501095036 100755 --- a/utils/fetch_os_creds.sh +++ b/utils/fetch_os_creds.sh @@ -8,7 +8,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## set -o errexit -set -o nounset set -o pipefail usage() { @@ -149,23 +148,33 @@ if [ "$installer_type" == "fuel" ]; then echo $auth_url >> $dest_path elif [ "$installer_type" == "apex" ]; then - if ! ipcalc -c $installer_ip; then - installer_ip=$(sudo virsh domifaddr undercloud | grep -Eo '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}') - if [ -z "$installer_ip" ] || ! $(ipcalc -c $installer_ip); then - echo "Unable to find valid IP for Apex undercloud: ${installer_ip}" - exit 1 - fi - fi - verify_connectivity $installer_ip + if [ -n "$RC_FILE_PATH" ]; then + echo "RC_FILE_PATH is set: ${RC_FILE_PATH}. Copying RC FILE to ${dest_path}" + sudo cp -f ${RC_FILE_PATH} ${dest_path} + else + if ! ipcalc -c $installer_ip; then + installer_ip=$(sudo virsh domifaddr undercloud | grep -Eo '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}') + if [ -z "$installer_ip" ] || ! $(ipcalc -c $installer_ip); then + echo "Unable to find valid IP for Apex undercloud: ${installer_ip}" + exit 1 + fi + fi + verify_connectivity $installer_ip - # The credentials file is located in the Instack VM (192.0.2.1) - # NOTE: This might change for bare metal deployments - info "... from Instack VM $installer_ip..." - if [ -f /root/.ssh/id_rsa ]; then - chmod 600 /root/.ssh/id_rsa - fi - sudo scp $ssh_options root@$installer_ip:/home/stack/overcloudrc.v3 $dest_path + # The credentials file is located in the Instack VM (192.0.2.1) + # NOTE: This might change for bare metal deployments + info "... from Instack VM $installer_ip..." + if [ -f /root/.ssh/id_rsa ]; then + chmod 600 /root/.ssh/id_rsa + fi + if [ "${BRANCH}" == "stable/fraser" ]; then + rc_file=overcloudrc.v3 + else + rc_file=overcloudrc + fi + sudo scp $ssh_options root@$installer_ip:/home/stack/${rc_file} $dest_path + fi elif [ "$installer_type" == "compass" ]; then if [ "${BRANCH}" == "stable/danube" ]; then verify_connectivity $installer_ip diff --git a/utils/gpg_import_key.sh b/utils/gpg_import_key.sh index f45e40919..94ffbaab5 100755 --- a/utils/gpg_import_key.sh +++ b/utils/gpg_import_key.sh @@ -51,10 +51,14 @@ else if [ -z "$NODE_NAME" ]; then echo "Cannot find node name" exit 0 - else echo "Importing key for '$NODE_NAME'"; - gsutil cp gs://opnfv-signing-keys/"$NODE_NAME"-subkey . - gpg2 --import "$NODE_NAME"-subkey - rm -f "$NODE_NAME"-subkey - fi + elif gsutil ls gs://opnfv-signing-keys | grep $NODE_NAME; then + echo "Importing key for '$NODE_NAME'" + gsutil cp gs://opnfv-signing-keys/"$NODE_NAME"-subkey . + gpg2 --import "$NODE_NAME"-subkey + rm -f "$NODE_NAME"-subkey + else + echo "No keys found locally or remotely for host, skipping import" + exit 0 + fi fi diff --git a/utils/push-test-logs.sh b/utils/push-test-logs.sh index a87e399dd..253cfa7b3 100644 --- a/utils/push-test-logs.sh +++ b/utils/push-test-logs.sh @@ -21,15 +21,15 @@ dir_result="${HOME}/opnfv/$project/results/${branch}" # src: https://wiki.opnfv.org/display/INF/Hardware+Infrastructure # + intel-pod12 (vsperf) node_list=(\ -'lf-pod1' 'lf-pod2' 'intel-pod2' 'intel-pod12' \ +'lf-pod1' 'lf-pod2' \ 'lf-virtual2' 'lf-virtual3' \ -'intel-pod5' 'intel-pod6' 'intel-pod7' 'intel-pod8' 'intel-pod18' \ +'intel-pod12' 'intel-pod18' \ 'ericsson-pod1' 'ericsson-pod2' \ 'ericsson-virtual1' 'ericsson-virtual2' 'ericsson-virtual3' \ -'ericsson-virtual4' 'ericsson-virtual5' 'ericsson-virtual12' \ -'arm-pod1' 'arm-pod5' 'arm-pod6' \ -'huawei-pod1' 'huawei-pod2' 'huawei-pod3' 'huawei-pod4' 'huawei-pod5' \ -'huawei-pod6' 'huawei-pod7' 'huawei-pod12' \ +'ericsson-virtual4' 'ericsson-virtual5' \ +'arm-pod5' 'arm-pod6' \ +'huawei-pod1' 'huawei-pod2' 'huawei-pod3' 'huawei-pod4' \ +'huawei-pod6' 'huawei-pod7' 'huawei-pod12' 'huawei-pod8' \ 'huawei-virtual1' 'huawei-virtual2' 'huawei-virtual3' 'huawei-virtual4' \ 'huawei-virtual5' 'huawei-virtual8' 'huawei-virtual9' \ 'zte-pod2' 'zte-pod3' 'zte-pod9' \ @@ -64,11 +64,11 @@ if [ -d "$dir_result" ]; then else echo "Uploading logs to artifact $project_artifact" gsutil -m cp -r "$dir_result"/* gs://artifacts.opnfv.org/"$project_artifact"/ >/dev/null 2>&1 - echo "Logs can be found in http://artifacts.opnfv.org/logs_${project}_${testbed}.html" + echo "Logs can be found in https://artifacts.opnfv.org/logs_${project}_${testbed}.html" cd $dir_result files=($(find . -name \* -print|sed 's/^\.//'|sed '/^\s*$/d')) for f in ${files[@]}; do - echo "http://artifacts.opnfv.org/${project_artifact}${f}" + echo "https://artifacts.opnfv.org/${project_artifact}${f}" done fi fi |