Skip to content
This repository has been archived by the owner on Feb 9, 2024. It is now read-only.

Commit

Permalink
Use build API key name as used in robotest in other scripts consistently
Browse files Browse the repository at this point in the history
  • Loading branch information
a-palchikov committed Aug 13, 2020
1 parent 81a3540 commit 166d95d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
5 changes: 2 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ timestamps {
withCredentials([
sshUserPrivateKey(credentialsId: '08267d86-0b3a-4101-841e-0036bf780b11', keyFileVariable: 'GITHUB_SSH_KEY'),
usernamePassword(credentialsId: 'jenkins-aws-s3', usernameVariable: 'AWS_ACCESS_KEY_ID', passwordVariable: 'AWS_SECRET_ACCESS_KEY'),
string(credentialsId:'GET_GRAVITATIONAL_IO_APIKEY', variable: 'BUILD_APIKEY'),
string(credentialsId:'GET_GRAVITATIONAL_IO_APIKEY', variable: 'GET_GRAVITATIONAL_IO_APIKEY'),
]) {
sh 'make -C e production telekube-intermediate-upgrade opscenter'
}
Expand All @@ -81,11 +81,10 @@ timestamps {
robotest : {
if (env.RUN_ROBOTEST == 'run') {
withCredentials([
string(credentialsId: 'GET_GRAVITATIONAL_IO_APIKEY', variable: 'GET_GRAVITATIONAL_IO_APIKEY'),
string(credentialsId: 'GET_GRAVITATIONAL_IO_APIKEY', variable: 'GET_GRAVITATIONAL_IO_APIKEY'),
file(credentialsId:'ROBOTEST_LOG_GOOGLE_APPLICATION_CREDENTIALS', variable: 'GOOGLE_APPLICATION_CREDENTIALS'),
file(credentialsId:'OPS_SSH_KEY', variable: 'SSH_KEY'),
file(credentialsId:'OPS_SSH_PUB', variable: 'SSH_PUB'),
string(credentialsId:'GET_GRAVITATIONAL_IO_APIKEY', variable: 'BUILD_APIKEY'),
]) {
sh 'make -C e robotest-run-suite'
}
Expand Down
8 changes: 4 additions & 4 deletions build.assets/robotest/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ tele=$GRAVITY_BUILDDIR/tele
mkdir -p $UPGRADE_FROM_DIR
for release in ${!UPGRADE_MAP[@]}; do
$tele pull telekube:$release \
--output=$UPGRADE_FROM_DIR/telekube_$release.tar \
--state-dir $GRAVITY_BUILDDIR/.robotest \
--hub=https://get.gravitational.io:443 \
--token="$GET_GRAVITATIONAL_IO_APIKEY"
--output=$UPGRADE_FROM_DIR/telekube_$release.tar \
--state-dir $GRAVITY_BUILDDIR/.robotest \
--hub=https://get.gravitational.io:443 \
--token="$GET_GRAVITATIONAL_IO_APIKEY"
done

docker pull $ROBOTEST_REPO
Expand Down
2 changes: 1 addition & 1 deletion e
Submodule e updated from 17d658 to 48cd1e

0 comments on commit 166d95d

Please sign in to comment.