Skip to content

Commit 83144a9

Browse files
NatSquaredNatSquared
committed
refactor: fix environment variable usage in CI workflows
1 parent fb39494 commit 83144a9

5 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎.github/workflows/analytics-api-cd.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,16 @@ jobs:
5656
5757
- name: Login Docker
5858
run: |
59-
echo "${{ env.OPENSHIFT_SA_TOKEN }}" |
60-
docker login ${{ env.OPENSHIFT_IMAGE_REGISTRY }} -u ${{ env.OPENSHIFT_SA_NAME}} --password-stdin
59+
echo "${OPENSHIFT_SA_TOKEN}" |
60+
docker login ${OPENSHIFT_IMAGE_REGISTRY} -u ${OPENSHIFT_SA_NAME} --password-stdin
6161
6262
- name: Build image
6363
run: |
6464
docker build . --file Dockerfile --tag image
6565
6666
- name: Push image
6767
run: |
68-
IMAGE_ID=${{ env.OPENSHIFT_IMAGE_REGISTRY }}/"${{ env.OPENSHIFT_REPOSITORY}}-tools"/$APP_NAME
68+
IMAGE_ID=${OPENSHIFT_IMAGE_REGISTRY}/"${OPENSHIFT_REPOSITORY}-tools"/$APP_NAME
6969
docker tag image $IMAGE_ID:latest
7070
docker push $IMAGE_ID:latest
7171
docker image tag $IMAGE_ID:latest $IMAGE_ID:$TAG_NAME
@@ -74,4 +74,4 @@ jobs:
7474
- name: Rollout
7575
shell: bash
7676
run: |
77-
oc rollout status deployment/${{ env.APP_NAME }} -n ${{ env.OPENSHIFT_REPOSITORY }}-${{ env.TAG_NAME }} -w
77+
oc rollout status deployment/${APP_NAME} -n ${OPENSHIFT_REPOSITORY}-${TAG_NAME} -w

‎.github/workflows/met-api-cd.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,16 @@ jobs:
5656
5757
- name: Login Docker
5858
run: |
59-
echo "${{ env.OPENSHIFT_SA_TOKEN }}" |
60-
docker login ${{ env.OPENSHIFT_IMAGE_REGISTRY }} -u ${{ env.OPENSHIFT_SA_NAME}} --password-stdin
59+
echo "${OPENSHIFT_SA_TOKEN}" |
60+
docker login ${OPENSHIFT_IMAGE_REGISTRY} -u ${OPENSHIFT_SA_NAME} --password-stdin
6161
6262
- name: Build image
6363
run: |
6464
docker build . --file Dockerfile --tag image
6565
6666
- name: Push image
6767
run: |
68-
IMAGE_ID=${{ env.OPENSHIFT_IMAGE_REGISTRY }}/"${{ env.OPENSHIFT_REPOSITORY}}-tools"/$APP_NAME
68+
IMAGE_ID=${OPENSHIFT_IMAGE_REGISTRY}/"${OPENSHIFT_REPOSITORY}-tools"/$APP_NAME
6969
docker tag image $IMAGE_ID:latest
7070
docker push $IMAGE_ID:latest
7171
docker image tag $IMAGE_ID:latest $IMAGE_ID:$TAG_NAME
@@ -74,4 +74,4 @@ jobs:
7474
- name: Rollout
7575
shell: bash
7676
run: |
77-
oc rollout status deployment/${{ env.APP_NAME }} -n ${{ env.OPENSHIFT_REPOSITORY }}-${{ env.TAG_NAME }} -w
77+
oc rollout status deployment/${APP_NAME} -n ${OPENSHIFT_REPOSITORY}-${TAG_NAME} -w

‎.github/workflows/met-cron-cd.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,16 @@ jobs:
5757
5858
- name: Login Docker
5959
run: |
60-
echo "${{ env.OPENSHIFT_SA_TOKEN }}" |
61-
docker login ${{ env.OPENSHIFT_IMAGE_REGISTRY }} -u ${{ env.OPENSHIFT_SA_NAME}} --password-stdin
60+
echo "${OPENSHIFT_SA_TOKEN}" |
61+
docker login ${OPENSHIFT_IMAGE_REGISTRY} -u ${OPENSHIFT_SA_NAME} --password-stdin
6262
6363
- name: Build image
6464
run: |
6565
docker build . --file Dockerfile --tag image
6666
6767
- name: Push image
6868
run: |
69-
IMAGE_ID=${{ env.OPENSHIFT_IMAGE_REGISTRY }}/"${{ env.OPENSHIFT_REPOSITORY}}-tools"/$APP_NAME
69+
IMAGE_ID=${OPENSHIFT_IMAGE_REGISTRY}/"${OPENSHIFT_REPOSITORY}-tools"/$APP_NAME
7070
docker tag image $IMAGE_ID:latest
7171
docker push $IMAGE_ID:latest
7272
docker image tag $IMAGE_ID:latest $IMAGE_ID:$TAG_NAME
@@ -75,4 +75,4 @@ jobs:
7575
- name: Rollout
7676
shell: bash
7777
run: |
78-
oc rollout status deployment/${{ env.APP_NAME }} -n ${{ env.OPENSHIFT_REPOSITORY }}-${{ env.TAG_NAME }} -w
78+
oc rollout status deployment/${APP_NAME} -n ${OPENSHIFT_REPOSITORY}-${TAG_NAME} -w

‎.github/workflows/met-etl-cd.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,16 @@ jobs:
5858
5959
- name: Login Docker
6060
run: |
61-
echo "${{ env.OPENSHIFT_SA_TOKEN }}" |
62-
docker login ${{ env.OPENSHIFT_IMAGE_REGISTRY }} -u ${{ env.OPENSHIFT_SA_NAME}} --password-stdin
61+
echo "${OPENSHIFT_SA_TOKEN}" |
62+
docker login ${OPENSHIFT_IMAGE_REGISTRY} -u ${OPENSHIFT_SA_NAME} --password-stdin
6363
6464
- name: Build image
6565
run: |
6666
docker build . --file Dockerfile --tag image
6767
6868
- name: Push image
6969
run: |
70-
IMAGE_ID=${{ env.OPENSHIFT_IMAGE_REGISTRY }}/"${{ env.OPENSHIFT_REPOSITORY}}-tools"/$APP_NAME
70+
IMAGE_ID=${OPENSHIFT_IMAGE_REGISTRY}/"${OPENSHIFT_REPOSITORY}-tools"/$APP_NAME
7171
docker tag image $IMAGE_ID:latest
7272
docker push $IMAGE_ID:latest
7373
docker image tag $IMAGE_ID:latest $IMAGE_ID:$TAG_NAME
@@ -76,4 +76,4 @@ jobs:
7676
- name: Rollout
7777
shell: bash
7878
run: |
79-
oc rollout status deployment/${{ env.DEPLOYMENT_NAME }} -n ${{ env.OPENSHIFT_REPOSITORY }}-${{ env.TAG_NAME }} -w
79+
oc rollout status deployment/${DEPLOYMENT_NAME} -n ${OPENSHIFT_REPOSITORY}-${TAG_NAME} -w

‎.github/workflows/met-web-cd.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ jobs:
5858
5959
- name: Login Docker
6060
run: |
61-
echo "${{ env.OPENSHIFT_SA_TOKEN }}" |
62-
docker login ${{ env.OPENSHIFT_IMAGE_REGISTRY }} -u ${{ env.OPENSHIFT_SA_NAME}} --password-stdin
61+
echo "${OPENSHIFT_SA_TOKEN}" |
62+
docker login ${OPENSHIFT_IMAGE_REGISTRY} -u ${OPENSHIFT_SA_NAME} --password-stdin
6363
6464
- name: Create Artifactory secret files
6565
run: |
66-
echo -n "${{ env.ARTIFACTORY_USERNAME }}" > /tmp/artifactory_username
67-
echo -n "${{ env.ARTIFACTORY_PASSWORD }}" > /tmp/artifactory_password
66+
echo -n "${ARTIFACTORY_USERNAME}" > /tmp/artifactory_username
67+
echo -n "${ARTIFACTORY_PASSWORD}" > /tmp/artifactory_password
6868
6969
- name: Build image with BuildKit secrets
7070
env:
@@ -77,7 +77,7 @@ jobs:
7777
7878
- name: Push image
7979
run: |
80-
IMAGE_ID=${{ env.OPENSHIFT_IMAGE_REGISTRY }}/"${{ env.OPENSHIFT_REPOSITORY}}-tools"/$APP_NAME
80+
IMAGE_ID=${OPENSHIFT_IMAGE_REGISTRY}/"${OPENSHIFT_REPOSITORY}-tools"/$APP_NAME
8181
docker tag image $IMAGE_ID:latest
8282
docker push $IMAGE_ID:latest
8383
docker image tag $IMAGE_ID:latest $IMAGE_ID:$TAG_NAME
@@ -86,4 +86,4 @@ jobs:
8686
- name: Rollout
8787
shell: bash
8888
run: |
89-
oc rollout status deployment/${{ env.APP_NAME }} -n ${{ env.OPENSHIFT_REPOSITORY }}-${{ env.TAG_NAME }} -w
89+
oc rollout status deployment/${APP_NAME} -n ${OPENSHIFT_REPOSITORY}-${TAG_NAME} -w

0 commit comments

Comments
 (0)