diff options
| -rw-r--r-- | jjb/auto/auto.yaml | 28 | ||||
| -rwxr-xr-x | jjb/cperf/cperf-robot-netvirt-csit.sh | 5 | ||||
| -rw-r--r-- | jjb/global/slave-params.yaml | 15 | ||||
| -rwxr-xr-x | utils/jenkins-jnlp-connect.sh | 24 |
4 files changed, 56 insertions, 16 deletions
diff --git a/jjb/auto/auto.yaml b/jjb/auto/auto.yaml index abba9c8d3..ccf723f01 100644 --- a/jjb/auto/auto.yaml +++ b/jjb/auto/auto.yaml @@ -45,6 +45,7 @@ jobs: - '{installer}-{scenario}-{pod}-auto-daily-{stream}' - '{installer}-deploy-{pod}-daily-{stream}' + - 'auto-daily-{stream}' - 'auto-verify-{stream}' - 'auto-merge-{stream}' @@ -101,6 +102,33 @@ block: true - job-template: + name: 'auto-daily-{stream}' + + disabled: '{obj:disabled}' + + properties: + - logrotate-default + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'auto-daily-.*' + blocking-level: 'NODE' + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - 'intel-pod18-defaults' + + triggers: + - timed: '0 16 * * *' + + builders: + - shell: | + pwd + ./ci/build-auto.sh daily + +- job-template: name: 'auto-verify-{stream}' disabled: '{obj:disabled}' diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh index fe5d57879..c30f10ae3 100755 --- a/jjb/cperf/cperf-robot-netvirt-csit.sh +++ b/jjb/cperf/cperf-robot-netvirt-csit.sh @@ -145,10 +145,6 @@ SUITE_HOME='/home/opnfv/repos/odl_test/csit/suites' # Disabled suites # -# ${SUITE_HOME}/openstack/connectivity/live_migration.robot -# Live migration will not work unless we use a shared storage backend like -# Ceph which we do not currently use with CSIT images -# # ${SUITE_HOME}/netvirt/vpnservice/vpn_basic_ipv6.robot # This suite fails with an error indicating the connection was closed # to the overcloud control node: @@ -161,6 +157,7 @@ if [ "$NUM_CONTROL_NODES" -eq 3 ]; then else suites="${SUITE_HOME}/openstack/connectivity/l2.robot \ ${SUITE_HOME}/openstack/connectivity/l3.robot \ + ${SUITE_HOME}/openstack/connectivity/live_migration.robot \ ${SUITE_HOME}/openstack/connectivity/external_network.robot \ ${SUITE_HOME}/openstack/connectivity/security_group.robot \ ${SUITE_HOME}/openstack/securitygroup/neutron_security_group.robot \ diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml index 30ecd2a03..e62a75c66 100644 --- a/jjb/global/slave-params.yaml +++ b/jjb/global/slave-params.yaml @@ -793,6 +793,21 @@ description: 'Git URL to use on this Jenkins Slave' - parameter: + name: 'intel-pod18-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-pod18 + default-slaves: + - intel-pod18 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + +- parameter: name: 'huawei-pod3-defaults' parameters: - node: diff --git a/utils/jenkins-jnlp-connect.sh b/utils/jenkins-jnlp-connect.sh index 0647d3210..17c03b070 100755 --- a/utils/jenkins-jnlp-connect.sh +++ b/utils/jenkins-jnlp-connect.sh @@ -8,7 +8,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -#Monit setup script for opnfv jnlp slave connections +#Monit setup script for opnfv jnlp agent connections test_firewall() { jenkins_hostname="${jenkins_hostname:-build.opnfv.org}" @@ -25,7 +25,7 @@ LF firewall not open, please send a report to helpdesk with your gpg key attache opnfv-helpdesk@rt.linuxfoundation.org Jenkins Home: $jenkinshome Jenkins User: $jenkinsuser -Slave Name: $slave_name +Slave Name: $agent_name IP Address: $(curl -s http://icanhazip.com) EOF exit 1 @@ -44,8 +44,8 @@ main () { exit 1 fi - if [[ -z $slave_name || -z $slave_secret ]]; then - echo "slave name or secret not defined, please edit this file to define it" + if [[ -z $agent_name || -z $agent_secret ]]; then + echo "agent name or secret not defined, please edit this file to define it" exit 1 fi @@ -141,8 +141,8 @@ depends on jenkins_piddir\ fi if [[ $started_monit == "true" ]]; then - wget --timestamping https://"$jenkins_hostname"/jnlpJars/slave.jar && true - chown $jenkinsuser:$jenkinsuser slave.jar + wget --timestamping https://"$jenkins_hostname"/jnlpJars/agent.jar && true + chown $jenkinsuser:$jenkinsuser agent.jar if [[ -f /var/run/$jenkinsuser/jenkins_jnlp_pid ]]; then echo "pid file found" @@ -173,8 +173,8 @@ usage() { cat << EOF **this file must be copied to the jenkins home directory to work** -jenkins-jnlp-connect.sh configures monit to keep slave connection up -Checks for new versions of slave.jar +jenkins-jnlp-connect.sh configures monit to keep agent connection up +Checks for new versions of agent.jar run as root to create pid directory and create monit config. can be run as root additional times if you change variables and need to update monit config. after running as root you should see "you are ready to start monit" @@ -183,7 +183,7 @@ usage: $0 [OPTIONS] -h show this message -j set jenkins home -u set jenkins user - -n set slave name + -n set agent name -s set secret key -l set host, default is build.opnfv.org/ci -t test the connection string by connecting without monit @@ -205,8 +205,8 @@ do case $OPTION in j ) jenkinshome="$OPTARG" ;; u ) jenkinsuser="$OPTARG" ;; - n ) slave_name="$OPTARG" ;; - s ) slave_secret="$OPTARG";; + n ) agent_name="$OPTARG" ;; + s ) agent_secret="$OPTARG";; l ) jenkins_hostname="$OPTARG" ;; h ) usage ;; t ) started_monit=true @@ -218,5 +218,5 @@ do done jenkins_hostname="${jenkins_hostname:-build.opnfv.org/ci}" -connectionstring="java -jar slave.jar -jnlpUrl https://"$jenkins_hostname"/computer/"$slave_name"/slave-agent.jnlp -secret "$slave_secret" -noCertificateCheck " +connectionstring="java -jar agent.jar -jnlpUrl https://"$jenkins_hostname"/computer/"$agent_name"/agent-agent.jnlp -secret "$agent_secret" -noCertificateCheck " main "$@" |