Merge pull request #67 from ccojocar/volumes-for-secrets

fix: set the environment variables directly from secrets instead of using step credential command

bdd/bdd.sh

@@ -13,9 +13,6 @@ export GH_USERNAME="jenkins-x-bot-test"
 export GH_EMAIL="[email protected]"
 export GH_OWNER="cb-kubecd"
 
-export GH_CREDS_PSW="$(jx step credential -s jenkins-x-bot-test-github)"
-export JENKINS_CREDS_PSW="$(jx step credential -s test-jenkins-user)"
-
 # fix broken `BUILD_NUMBER` env var
 export BUILD_NUMBER="$BUILD_ID"
 
@@ -37,11 +34,11 @@ git config --global --add user.email [email protected]
 echo "running the BDD tests with JX_HOME = $JX_HOME"
 
 # setup jx boot parameters
-export JX_VALUE_ADMINUSER_PASSWORD="$JENKINS_CREDS_PSW"
+export JX_VALUE_ADMINUSER_PASSWORD="$JENKINS_PASSWORD"
 export JX_VALUE_PIPELINEUSER_USERNAME="$GH_USERNAME"
 export JX_VALUE_PIPELINEUSER_EMAIL="$GH_EMAIL"
-export JX_VALUE_PIPELINEUSER_TOKEN="$GH_CREDS_PSW"
-export JX_VALUE_PROW_HMACTOKEN="$GH_CREDS_PSW"
+export JX_VALUE_PIPELINEUSER_TOKEN="$GH_ACCESS_TOKEN"
+export JX_VALUE_PROW_HMACTOKEN="$GH_ACCESS_TOKEN"
 
 # TODO temporary hack until the batch mode in jx is fixed...
 export JX_BATCH_MODE="true"
@@ -79,8 +76,8 @@ jx step bdd \
  --git-provider=github \
  --git-username $GH_USERNAME \
  --git-owner $GH_OWNER \
- --git-api-token $GH_CREDS_PSW \
- --default-admin-password $JENKINS_CREDS_PSW \
+ --git-api-token $GH_ACCESS_TOKEN \
+ --default-admin-password $JENKINS_PASSWORD \
  --no-delete-app \
  --no-delete-repo \
  --tests install \

jenkins-x-bdd-local.yml

@@ -19,6 +19,16 @@ pipelineConfig:
  value: /secrets/bdd/sa.json
  - name: DOMAIN_ROTATION
  value: "false"
+ - name: GH_ACCESS_TOKEN 
+ valueFrom:
+ secretKeyRef:
+ name: jenkins-x-bot-test-github
+ key: password
+ - name: JENKINS_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: test-jenkins-user 
+ key: password
  agent:
  image: gcr.io/jenkinsxio/builder-go-maven
  stages:

jenkins-x-bdd-vault.yml

@@ -23,6 +23,16 @@ pipelineConfig:
  value: ".bdd.jenkins-x.rocks"
  - name: GKE_SA
  value: /secrets/bdd/sa.json
+ - name: GH_ACCESS_TOKEN 
+ valueFrom:
+ secretKeyRef:
+ name: jenkins-x-bot-test-github
+ key: password
+ - name: JENKINS_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: test-jenkins-user 
+ key: password
  agent:
  image: gcr.io/jenkinsxio/builder-go-maven
  stages: