xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-31 01:56:39 +00:00
Code Issues Releases Wiki Activity

Merge pull request #6848 from peterwywong/sles_rest_tests

Browse Source 
Extend the REST test cases to SLES
This commit is contained in:
Mark Gurevich 2020-10-02 09:36:02 -04:00 committed by GitHub
commit 9cbb9edc5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
xCAT-test/autotest/bundle/sles_ppcle_daily.bundle
View File

@ -7,6 +7,7 @@ assign_certain_command_permission
bmcdiscover_help
bmcdiscover_q
bmcdiscover_version
#INCLUDE:restapi.bundle#
xdcp_nonroot_user
xdsh_E
xdsh_Q_command

1
xCAT-test/autotest/bundle/sles_x86_daily.bundle
View File

@ -7,6 +7,7 @@ assign_certain_command_permission
bmcdiscover_help
bmcdiscover_q
bmcdiscover_version
#INCLUDE:restapi.bundle#
xdcp_nonroot_user
xdsh_E
xdsh_Q_command

20
xCAT-test/autotest/testcase/restapi/cases0
View File

@ -4,10 +4,19 @@ label:restapi
#Install the mod_ssl package on Red Hat
cmd:if cat /etc/*release | grep "Red Hat" >/dev/null; then yum install mod_ssl -y; rpm -qa | grep mod_ssl; fi
check:rc==0
cmd:sed -i 's/^\(\s*\)SSLCertificateFile.*$/\1SSLCertificateFile \/etc\/xcat\/cert\/server-cred.pem/' /etc/httpd/conf.d/ssl.conf
cmd:sed -i 's/^\(\s*SSLCertificateKeyFile.*\)$/#\1/' /etc/httpd/conf.d/ssl.conf
cmd:if cat /etc/*release | grep "Red Hat" >/dev/null; then sed -i 's/^\(\s*\)SSLCertificateFile.*$/\1SSLCertificateFile \/etc\/xcat\/cert\/server-cred.pem/' /etc/httpd/conf.d/ssl.conf; fi
cmd:if cat /etc/*release | grep "Red Hat" >/dev/null; then sed -i 's/^\(\s*SSLCertificateKeyFile.*\)$/#\1/' /etc/httpd/conf.d/ssl.conf; fi
check:rc==0
cmd:if cat /etc/*release | grep "Red Hat" >/dev/null; then service httpd restart; fi
check:rc==0
#Configure the SLES environment
cmd:if cat /etc/*release | grep "SLES" >/dev/null; then a2enmod ssl; a2enflag SSL; cp /etc/apache2/vhosts.d/vhost-ssl.template /etc/apache2/vhosts.d/vhost-ssl.conf; fi
check:rc==0
cmd:if cat /etc/*release | grep "SLES" >/dev/null; then sed -i 's/^\(\s*\)SSLCertificateFile.*$/\1SSLCertificateFile \/etc\/xcat\/cert\/server-cred.pem/' /etc/apache2/vhosts.d/vhost-ssl.conf; fi
cmd:if cat /etc/*release | grep "SLES" >/dev/null; then sed -i 's/^\(\s*SSLCertificateKeyFile.*\)$/#\1/' /etc/apache2/vhosts.d/vhost-ssl.conf; fi
check:rc==0
cmd:if cat /etc/*release | grep "SLES" >/dev/null; then service apache2 restart; fi
check:rc==0
cmd:scp /install/postscripts/ca/ca-cert.pem $$CN:/root
check:rc==0
cmd:tabch key=xcat,username=__GETTABLEVALUE(key,system,username,passwd)__ passwd.password=__GETTABLEVALUE(key,system,password,passwd)__
@ -22,8 +31,11 @@ check:rc==0
cmd:tabch -d key=xcat passwd
check:rc==0
#Remove the mod_ssl package on Red Hat
cmd:if cat /etc/*release | grep "Red Hat" >/dev/null; then yum remove mod_ssl -y; service httpd restart; rpm -qa | grep mod_ssl; fi
check:rc==1
cmd:if cat /etc/*release | grep "Red Hat" >/dev/null; then yum remove mod_ssl -y; service httpd restart; fi
check:rc==0
#Clean up the SLES environment
cmd:if cat /etc/*release | grep "SLES" >/dev/null; then rm /etc/apache2/vhosts.d/vhost-ssl.conf; service apache2 restart; fi
check:rc==0
end
start:restapi_list_all_resources