diff options
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/fuel/fuel-build.sh | 2 | ||||
| -rw-r--r-- | jjb/fuel/fuel-ci-jobs.yml | 9 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-deploy.sh | 2 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-download-artifact.sh | 2 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-lab-reconfig.sh | 2 | ||||
| -rw-r--r-- | jjb/fuel/fuel-project-jobs.yml | 2 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-upload-artifact.sh | 2 |
7 files changed, 9 insertions, 12 deletions
diff --git a/jjb/fuel/fuel-build.sh b/jjb/fuel/fuel-build.sh index 77b045521..be188b87a 100755 --- a/jjb/fuel/fuel-build.sh +++ b/jjb/fuel/fuel-build.sh @@ -31,7 +31,7 @@ else fi # log info to console -echo "Starting the build of $INSTALLER. This could take some time..." +echo "Starting the build of $INSTALLER_TYPE. This could take some time..." echo "--------------------------------------------------------" echo diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index 81dc62403..57adc7ba4 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -29,8 +29,8 @@ <<: *master - ericsson-pod1: <<: *master -# - ericsson-pod2: -# <<: *master + - ericsson-pod2: + <<: *master #-------------------------------- # Milestone E Mapping # !!!DO NOT ENABLE!!! @@ -39,9 +39,6 @@ #-------------------------------- # - opnfv-jump-2: # <<: *brahmaputra -# TESTING the CI stuff!!!!!!! - - ericsson-pod2: - <<: *brahmaputra # please check the triggers before enabling any of the controllers!!! sdn-controller: @@ -200,7 +197,7 @@ description: "Directory where the build artifact will be located upon the completion of the build." - string: name: CACHE_DIRECTORY - default: $HOME/opnfv/cache/$INSTALLER + default: $HOME/opnfv/cache/$INSTALLER_TYPE description: "Directory where the cache to be used during the build is located." - string: name: GS_URL diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index b617bcf01..2cea28b95 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -35,7 +35,7 @@ sudo $WORKSPACE/genesis/common/ci/clean.sh -base_config $WORKSPACE/genesis/forem sudo $WORKSPACE/genesis/common/ci/setup.sh # log info to console -echo "Starting the deployment using $INSTALLER. This could take some time..." +echo "Starting the deployment using $INSTALLER_TYPE. This could take some time..." echo "--------------------------------------------------------" echo diff --git a/jjb/fuel/fuel-download-artifact.sh b/jjb/fuel/fuel-download-artifact.sh index 05dc05e05..79f411994 100755 --- a/jjb/fuel/fuel-download-artifact.sh +++ b/jjb/fuel/fuel-download-artifact.sh @@ -18,7 +18,7 @@ fi source latest.properties # log info to console -echo "Downloading the $INSTALLER artifact using URL http://$OPNFV_ARTIFACT_URL" +echo "Downloading the $INSTALLER_TYPE artifact using URL http://$OPNFV_ARTIFACT_URL" echo "This could take some time..." echo "--------------------------------------------------------" echo diff --git a/jjb/fuel/fuel-lab-reconfig.sh b/jjb/fuel/fuel-lab-reconfig.sh index a79bc2c51..55bb5dd9d 100755 --- a/jjb/fuel/fuel-lab-reconfig.sh +++ b/jjb/fuel/fuel-lab-reconfig.sh @@ -19,7 +19,7 @@ if ! GIT_SSL_NO_VERIFY=true git clone https://gerrit.opnfv.org/gerrit/releng; th fi # log info to console -echo "Starting the lab reconfiguration for $INSTALLER..." +echo "Starting the lab reconfiguration for $INSTALLER_TYPE..." echo "--------------------------------------------------------" echo diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml index 3ad28c198..7cb342e98 100644 --- a/jjb/fuel/fuel-project-jobs.yml +++ b/jjb/fuel/fuel-project-jobs.yml @@ -202,7 +202,7 @@ description: "Directory where the build artifact will be located upon the completion of the build." - string: name: CACHE_DIRECTORY - default: $HOME/opnfv/cache/$INSTALLER + default: $HOME/opnfv/cache/$INSTALLER_TYPE description: "Directory where the cache to be used during the build is located." - string: name: GS_URL diff --git a/jjb/fuel/fuel-upload-artifact.sh b/jjb/fuel/fuel-upload-artifact.sh index b998e6a6a..1350abdd7 100755 --- a/jjb/fuel/fuel-upload-artifact.sh +++ b/jjb/fuel/fuel-upload-artifact.sh @@ -4,7 +4,7 @@ set -o nounset set -o pipefail # log info to console -echo "Uploading the $INSTALLER artifact. This could take some time..." +echo "Uploading the $INSTALLER_TYPE artifact. This could take some time..." echo "--------------------------------------------------------" echo |