Replace references to installers with {installer} in order to find out
commonalities between fuel and foreman later on.
JIRA: OCTO-47
Change-Id: Ife00ec23250894ff3698390b146bf6f3b1ac2046
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
- - 'genesis-foreman-verify'
- - 'genesis-foreman-merge'
- - 'genesis-foreman-daily-{stream}'
- - 'genesis-foreman-deploy'
+ - 'genesis-{installer}-verify'
+ - 'genesis-{installer}-merge'
+ - 'genesis-{installer}-daily-{stream}'
+ - 'genesis-{installer}-deploy'
# stream: branch with - in place of / (eg. stable-helium)
# branch: branch (eg. stable/helium)
# stream: branch with - in place of / (eg. stable-helium)
# branch: branch (eg. stable/helium)
########################
- job-template:
########################
- job-template:
- name: 'genesis-foreman-verify'
+ name: 'genesis-{installer}-verify'
artifactNumToKeep: -1
parameters:
artifactNumToKeep: -1
parameters:
+ - string:
+ name: INSTALLER
+ default: '{installer}'
+ description: "Installer to use."
- string:
name: BUILD_DIRECTORY
default: $WORKSPACE/build_output
- string:
name: BUILD_DIRECTORY
default: $WORKSPACE/build_output
- compare-type: ANT
pattern: 'common/**'
- compare-type: ANT
- compare-type: ANT
pattern: 'common/**'
- compare-type: ANT
+ pattern: '{installer}/**'
- name: 'genesis-foreman-merge'
+ name: 'genesis-{installer}-merge'
# builder-merge job to run JJB update
#
# builder-merge job to run JJB update
#
artifactNumToKeep: 5
parameters:
artifactNumToKeep: 5
parameters:
+ - string:
+ name: INSTALLER
+ default: '{installer}'
+ description: "Installer to use."
- string:
name: BUILD_DIRECTORY
default: $WORKSPACE/build_output
- string:
name: BUILD_DIRECTORY
default: $WORKSPACE/build_output
- compare-type: ANT
pattern: 'common/**'
- compare-type: ANT
- compare-type: ANT
pattern: 'common/**'
- compare-type: ANT
+ pattern: '{installer}/**'
- name: 'genesis-foreman-daily-{stream}'
+ name: 'genesis-{installer}-daily-{stream}'
project-type: freestyle
node: ericsson-build
parameters:
project-type: freestyle
node: ericsson-build
parameters:
+ - string:
+ name: INSTALLER
+ default: '{installer}'
+ description: "Installer to use."
- string:
name: BUILD_DIRECTORY
default: $WORKSPACE/build_output
description: "Directory where the build artifact will be located upon the completion of the build."
- string:
name: GS_URL
- string:
name: BUILD_DIRECTORY
default: $WORKSPACE/build_output
description: "Directory where the build artifact will be located upon the completion of the build."
- string:
name: GS_URL
- default: 'artifacts.opnfv.org/genesis/foreman'
+ default: 'artifacts.opnfv.org/genesis/{installer}'
description: "URL to Google Storage."
description: "URL to Google Storage."
- - string:
- name: INSTALLER
- default: 'foreman'
- description: "Installer to use."
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/genesis
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/genesis
artifactNumToKeep: -1
builders:
artifactNumToKeep: -1
builders:
- - 'foreman-daily-master'
- name: 'genesis-foreman-deploy'
+ name: 'genesis-{installer}-deploy'
artifactNumToKeep: -1
parameters:
artifactNumToKeep: -1
parameters:
+ - string:
+ name: INSTALLER
+ default: '{installer}'
+ description: "Installer to use."
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/genesis
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/genesis
refspec: $GERRIT_REFSPEC
builders:
refspec: $GERRIT_REFSPEC
builders:
########################
# builder macros
########################
- builder:
########################
# builder macros
########################
- builder:
builders:
- shell: |
#!/bin/bash
builders:
- shell: |
#!/bin/bash
set -x
# get the dependencies - temporary fix for RC0
set -x
# get the dependencies - temporary fix for RC0
- [[ -d $WORKSPACE/foreman/build ]] || mkdir -p $WORKSPACE/foreman/build
- cp /home/jenkins/Downloads/opnfv_iso/* $WORKSPACE/foreman/build/
+ [[ -d $WORKSPACE/$INSTALLER/build ]] || mkdir -p $WORKSPACE/$INSTALLER/build
+ cp /home/jenkins/Downloads/opnfv_iso/* $WORKSPACE/$INSTALLER/build/
# below lines perhaps need to be enabled in order to fetch images from internet
# as we are having disk space issues on ericsson-build slave
# below lines perhaps need to be enabled in order to fetch images from internet
# as we are having disk space issues on ericsson-build slave
#wget http://repos.duss-janser.ch/vagrant/vagrant_1.7.2_x86_64.rpm
# do the build
#wget http://repos.duss-janser.ch/vagrant/vagrant_1.7.2_x86_64.rpm
# do the build
- cd $WORKSPACE/foreman/ci
+ cd $WORKSPACE/$INSTALLER/ci
./build.sh $BUILD_DIRECTORY
# list the build artifacts
./build.sh $BUILD_DIRECTORY
# list the build artifacts
/bin/rm -rf $BUILD_DIRECTORY
- builder:
/bin/rm -rf $BUILD_DIRECTORY
- builder:
builders:
- shell: |
#!/bin/bash
builders:
- shell: |
#!/bin/bash
set -x
# get the dependencies - temporary fix for RC0
set -x
# get the dependencies - temporary fix for RC0
- [[ -d $WORKSPACE/foreman/build ]] || mkdir -p $WORKSPACE/foreman/build
- cp /home/jenkins/Downloads/opnfv_iso/* $WORKSPACE/foreman/build/
+ [[ -d $WORKSPACE/$INSTALLER/build ]] || mkdir -p $WORKSPACE/$INSTALLER/build
+ cp /home/jenkins/Downloads/opnfv_iso/* $WORKSPACE/$INSTALLER/build/
# below lines perhaps need to be enabled in order to fetch images from internet
# as we are having disk space issues on ericsson-build slave
# below lines perhaps need to be enabled in order to fetch images from internet
# as we are having disk space issues on ericsson-build slave
#wget http://repos.duss-janser.ch/vagrant/vagrant_1.7.2_x86_64.rpm
# do the build
#wget http://repos.duss-janser.ch/vagrant/vagrant_1.7.2_x86_64.rpm
# do the build
- cd $WORKSPACE/foreman/ci
+ cd $WORKSPACE/$INSTALLER/ci
./build.sh $BUILD_DIRECTORY
# list the build artifacts
./build.sh $BUILD_DIRECTORY
# list the build artifacts
/bin/rm -rf $BUILD_DIRECTORY
- builder:
/bin/rm -rf $BUILD_DIRECTORY
- builder:
- name: foreman-daily-master
builders:
- shell: |
#!/bin/bash
builders:
- shell: |
#!/bin/bash
set -x
# get the dependencies - temporary fix for RC0
set -x
# get the dependencies - temporary fix for RC0
- [[ -d $WORKSPACE/foreman/build ]] || mkdir -p $WORKSPACE/foreman/build
- cp /home/jenkins/Downloads/opnfv_iso/* $WORKSPACE/foreman/build/
+ [[ -d $WORKSPACE/$INSTALLER/build ]] || mkdir -p $WORKSPACE/$INSTALLER/build
+ cp /home/jenkins/Downloads/opnfv_iso/* $WORKSPACE/$INSTALLER/build/
# below lines perhaps need to be enabled in order to fetch images from internet
# as we are having disk space issues on ericsson-build slave
# below lines perhaps need to be enabled in order to fetch images from internet
# as we are having disk space issues on ericsson-build slave
#wget http://repos.duss-janser.ch/vagrant/vagrant_1.7.2_x86_64.rpm
# do the build
#wget http://repos.duss-janser.ch/vagrant/vagrant_1.7.2_x86_64.rpm
# do the build
- cd $WORKSPACE/foreman/ci
+ cd $WORKSPACE/$INSTALLER/ci
./build.sh -v $BUILD_ID $BUILD_DIRECTORY
- shell: |
./build.sh -v $BUILD_ID $BUILD_DIRECTORY
- shell: |
/bin/rm -rf $WORKSPACE/opnfv.iso
- builder:
/bin/rm -rf $WORKSPACE/opnfv.iso
- builder:
builders:
- shell: |
#!/bin/bash
builders:
- shell: |
#!/bin/bash
cd $WORKSPACE
# cleanup first
cd $WORKSPACE
# cleanup first
- sudo $WORKSPACE/foreman/ci/clean.sh -base_config $WORKSPACE/foreman/ci/inventory/lf_pod2_ksgen_settings.yml
+ sudo $WORKSPACE/$INSTALLER/ci/clean.sh -base_config $WORKSPACE/$INSTALLER/ci/inventory/lf_pod2_ksgen_settings.yml
# and then initiate deployment
# and then initiate deployment
- sudo $WORKSPACE/foreman/ci/deploy.sh -base_config $WORKSPACE/foreman/ci/inventory/lf_pod2_ksgen_settings.yml
+ sudo $WORKSPACE/$INSTALLER/ci/deploy.sh -base_config $WORKSPACE/$INSTALLER/ci/inventory/lf_pod2_ksgen_settings.yml