From 5add92f3cd8bc35e27bd631583860abf8721fda7 Mon Sep 17 00:00:00 2001 From: choim Date: Tue, 5 Nov 2024 08:31:44 -0700 Subject: [PATCH 01/26] flow.cal.conv build_tag_push_update script removed --- flow/flow.cal.conv/build_tag_push_update.sh | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100755 flow/flow.cal.conv/build_tag_push_update.sh diff --git a/flow/flow.cal.conv/build_tag_push_update.sh b/flow/flow.cal.conv/build_tag_push_update.sh deleted file mode 100755 index 20a5171cf..000000000 --- a/flow/flow.cal.conv/build_tag_push_update.sh +++ /dev/null @@ -1,11 +0,0 @@ -# Run from root repository (NEON-IS-data-processing) -#!/usr/bin/env bash -image_name=neon-is-cal-conv-r -tag=$(git rev-parse --short HEAD) -cd ./flow/flow.cal.conv -docker build -t $image_name:latest . -docker tag $image_name quay.io/battelleecology/$image_name:$tag -docker push quay.io/battelleecology/$image_name:$tag -cd ../.. - -Rscript ./utilities/flow.img.updt.R "./pipe" ".yaml" "quay.io/battelleecology/$image_name" "$tag" From 0ffe22e003f65d580b8a2a6e9d38ec92344f9db8 Mon Sep 17 00:00:00 2001 From: choim Date: Tue, 5 Nov 2024 08:39:15 -0700 Subject: [PATCH 02/26] flow.cal.conv Dockerfile moidified --- flow/flow.cal.conv/Dockerfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/flow/flow.cal.conv/Dockerfile b/flow/flow.cal.conv/Dockerfile index f8a10b667..581c58830 100644 --- a/flow/flow.cal.conv/Dockerfile +++ b/flow/flow.cal.conv/Dockerfile @@ -1,14 +1,17 @@ # Dockerfile for NEON IS Data Processing - Calibration Conversion # Start with the calibration package image. -FROM us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-pack-cal-r:v1.3.4 +FROM us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-pack-cal-r:sha-d31a011 + +ARG FLOW_DIR="./flow" +ARG APP_DIR="flow.cal.conv" # maintainer handle MAINTAINER "Cove Sturtevant" csturtevant@battelleecology.org # Copy the lockfile and restore known working versions of R dependency packages # ENSURE that the renv.lock file is up-to-date and thus has all listed dependencies prior to creating this docker image -COPY ./renv.lock /renv.lock +COPY ${FLOW_DIR}/${APP_DIR}/renv.lock /renv.lock RUN R -e 'renv::restore(lockfile="/renv.lock")' # Create app user @@ -17,8 +20,8 @@ RUN groupadd app && \ WORKDIR /home/app # Copy in application code -COPY ./flow.cal.conv.R . -COPY ./wrap.cal.conv.dp0p.R . +COPY ${FLOW_DIR}/${APP_DIR}/flow.cal.conv.R . +COPY ${FLOW_DIR}/${APP_DIR}/wrap.cal.conv.dp0p.R . # Run as app user RUN chown app:app -R /home/app From ef296dff425f7cf7ed0fee39eb0704b8a6ddd1aa Mon Sep 17 00:00:00 2001 From: choim Date: Tue, 5 Nov 2024 08:41:33 -0700 Subject: [PATCH 03/26] testing flow.cal.conv build-push --- .github/workflows/neon-test-auth.yml | 50 +++++++++++++--------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/.github/workflows/neon-test-auth.yml b/.github/workflows/neon-test-auth.yml index 40d2083e0..85ce9a3dc 100644 --- a/.github/workflows/neon-test-auth.yml +++ b/.github/workflows/neon-test-auth.yml @@ -1,7 +1,12 @@ -name: "Test Google SA Auth" +name: "Build-push_flow.cal.conv" on: - workflow_dispatch: + push: + branches: + - 'master' + paths: + - 'flow/flow.cal.conv/**' + workflow_dispatch: {} # Allows trigger of workflow from web interface env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }} @@ -9,43 +14,34 @@ env: GHCR_REGISTRY: ghcr.io GCP_ARTIFACT_HOST: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev GCP_REGISTRY: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev/${{ vars.SHARED_WIF_PROJECT }}/${{ vars.SHARED_WIF_REPO }} + GCP_PROVIDER: ${{ vars.SHARED_WIF_PROVIDER }} + GCP_SERVICE_ACCOUNT: ${{ vars.SHARED_WIF_SERVICE_ACCOUNT }} GHCR_NS: battelleecology # Use docker.io for Docker Hub if empty REGISTRY: ghcr.io - # github.repository as / - # IMAGE_NAME: ${{ github.repository }} - # Get just the repo name from the event + # Get just the repo name from the event, i.e., NEON-IS-data-processing REPO_NAME: ${{ github.event.repository.name }} - + # IS module name + MODULE_PATH: ./flow/flow.cal.conv + IMAGE_NAME: neon-is-cal-conv + jobs: - deploy: + build-push: runs-on: ubuntu-latest - permissions: # Read more at : https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs + permissions: contents: 'write' id-token: 'write' steps: - name: "Checkout" - uses: actions/checkout@v4.1.4 - - - name: "Checkout Branch" - uses: peterjgrainger/action-create-branch@v2.2.0 + uses: "actions/checkout@v4.1.4" with: - branch: 'liz-testings' - sha: '${{ github.event.pull_request.head.sha }}' + fetch-depth: '0' - - name: "Get short SHA" + - name: Get short SHA run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_ENV - - - name: "Test Auth" - uses: ./.github/actions/test-auth - with: - image-tag: "${short_sha}" - - name: "GOOGLE AUTH" - id: "auth" - uses: "google-github-actions/auth@v2" + - name: Build and push + uses: ./.github/actions/build-push with: - workload_identity_provider: "${{ vars.SHARED_WIF_PROVIDER }}" - service_account: "${{ vars.SHARED_WIF_SERVICE_ACCOUNT }}" - - + image-tag: "${short_sha}" + \ No newline at end of file From 72c4209c025b7c203fcb512f09e191ba5e987cf9 Mon Sep 17 00:00:00 2001 From: choim Date: Tue, 5 Nov 2024 08:50:19 -0700 Subject: [PATCH 04/26] flow.cal.cpnv build-push and update added --- .github/workflows/build_push_cal.conv.yml | 47 +++++++++++++++++ .../workflows/build_push_update_cal.conv.yml | 51 +++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 .github/workflows/build_push_cal.conv.yml create mode 100644 .github/workflows/build_push_update_cal.conv.yml diff --git a/.github/workflows/build_push_cal.conv.yml b/.github/workflows/build_push_cal.conv.yml new file mode 100644 index 000000000..85ce9a3dc --- /dev/null +++ b/.github/workflows/build_push_cal.conv.yml @@ -0,0 +1,47 @@ +name: "Build-push_flow.cal.conv" + +on: + push: + branches: + - 'master' + paths: + - 'flow/flow.cal.conv/**' + workflow_dispatch: {} # Allows trigger of workflow from web interface + +env: + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }} + # Use github and google registries + GHCR_REGISTRY: ghcr.io + GCP_ARTIFACT_HOST: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev + GCP_REGISTRY: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev/${{ vars.SHARED_WIF_PROJECT }}/${{ vars.SHARED_WIF_REPO }} + GCP_PROVIDER: ${{ vars.SHARED_WIF_PROVIDER }} + GCP_SERVICE_ACCOUNT: ${{ vars.SHARED_WIF_SERVICE_ACCOUNT }} + GHCR_NS: battelleecology + # Use docker.io for Docker Hub if empty + REGISTRY: ghcr.io + # Get just the repo name from the event, i.e., NEON-IS-data-processing + REPO_NAME: ${{ github.event.repository.name }} + # IS module name + MODULE_PATH: ./flow/flow.cal.conv + IMAGE_NAME: neon-is-cal-conv + +jobs: + build-push: + runs-on: ubuntu-latest + permissions: + contents: 'write' + id-token: 'write' + steps: + - name: "Checkout" + uses: "actions/checkout@v4.1.4" + with: + fetch-depth: '0' + + - name: Get short SHA + run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_ENV + + - name: Build and push + uses: ./.github/actions/build-push + with: + image-tag: "${short_sha}" + \ No newline at end of file diff --git a/.github/workflows/build_push_update_cal.conv.yml b/.github/workflows/build_push_update_cal.conv.yml new file mode 100644 index 000000000..4336c6b60 --- /dev/null +++ b/.github/workflows/build_push_update_cal.conv.yml @@ -0,0 +1,51 @@ +name: "Build-push-update_flow.cal.conv" + +on: + push: + # branches: + # - 'master' + tags: + - "flow.cal.conv/v*.*.*" +env: + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # Use github and google registries + GHCR_REGISTRY: ghcr.io + GCP_ARTIFACT_HOST: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev + GCP_REGISTRY: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev/${{ vars.SHARED_WIF_PROJECT }}/${{ vars.SHARED_WIF_REPO }} + GCP_PROVIDER: ${{ vars.SHARED_WIF_PROVIDER }} + GCP_SERVICE_ACCOUNT: ${{ vars.SHARED_WIF_SERVICE_ACCOUNT }} + GHCR_NS: battelleecology + # Use docker.io for Docker Hub if empty + REGISTRY: ghcr.io + # github.repository as / + # IMAGE_NAME: ${{ github.repository }} + # Get just the repo name from the event, i.e., NEON-IS-data-processing + REPO_NAME: ${{ github.event.repository.name }} + # IS module name + MODULE_PATH: ./flow/flow.cal.conv + IMAGE_NAME: neon-is-cal-conv + +jobs: + build-push-update: + runs-on: ubuntu-latest + permissions: + contents: 'write' + id-token: 'write' + pull-requests: 'write' + + steps: + - name: "Checkout" + uses: "actions/checkout@v4.1.4" + with: + ref: 'master' + fetch-depth: '0' + + - name: Get short SHA + run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_ENV + + - name: Get semver + run: echo "semver=$(git describe --tags --abbrev=0 --match=flow.cal.conv/v*.*.* | awk -F "/" '{print $2}')" >> $GITHUB_ENV + + - name: Build push and update + uses: ./.github/actions/build-push-update From 46581b9071b68249af9d4697ae00d271b241ddd9 Mon Sep 17 00:00:00 2001 From: choim Date: Tue, 5 Nov 2024 08:57:08 -0700 Subject: [PATCH 05/26] flow.cal.conv pipeline yaml modified --- .github/workflows/neon-test-auth.yml | 50 ++++++++++--------- pipe/exo/exo2_calibration_conversion.json | 5 +- ...xoconductivity_calibration_conversion.json | 5 +- ...issolvedoxygen_calibration_conversion.json | 5 +- pipe/exo/exofdom_calibration_conversion.json | 5 +- pipe/exo/exophorp_calibration_conversion.json | 5 +- .../exototalalgae_calibration_conversion.json | 5 +- .../exoturbidity_calibration_conversion.json | 5 +- .../tchain/tchain_calibration_conversion.yaml | 6 +-- 9 files changed, 37 insertions(+), 54 deletions(-) diff --git a/.github/workflows/neon-test-auth.yml b/.github/workflows/neon-test-auth.yml index 85ce9a3dc..40d2083e0 100644 --- a/.github/workflows/neon-test-auth.yml +++ b/.github/workflows/neon-test-auth.yml @@ -1,12 +1,7 @@ -name: "Build-push_flow.cal.conv" +name: "Test Google SA Auth" on: - push: - branches: - - 'master' - paths: - - 'flow/flow.cal.conv/**' - workflow_dispatch: {} # Allows trigger of workflow from web interface + workflow_dispatch: env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }} @@ -14,34 +9,43 @@ env: GHCR_REGISTRY: ghcr.io GCP_ARTIFACT_HOST: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev GCP_REGISTRY: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev/${{ vars.SHARED_WIF_PROJECT }}/${{ vars.SHARED_WIF_REPO }} - GCP_PROVIDER: ${{ vars.SHARED_WIF_PROVIDER }} - GCP_SERVICE_ACCOUNT: ${{ vars.SHARED_WIF_SERVICE_ACCOUNT }} GHCR_NS: battelleecology # Use docker.io for Docker Hub if empty REGISTRY: ghcr.io - # Get just the repo name from the event, i.e., NEON-IS-data-processing + # github.repository as / + # IMAGE_NAME: ${{ github.repository }} + # Get just the repo name from the event REPO_NAME: ${{ github.event.repository.name }} - # IS module name - MODULE_PATH: ./flow/flow.cal.conv - IMAGE_NAME: neon-is-cal-conv - + jobs: - build-push: + deploy: runs-on: ubuntu-latest - permissions: + permissions: # Read more at : https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs contents: 'write' id-token: 'write' steps: - name: "Checkout" - uses: "actions/checkout@v4.1.4" + uses: actions/checkout@v4.1.4 + + - name: "Checkout Branch" + uses: peterjgrainger/action-create-branch@v2.2.0 with: - fetch-depth: '0' + branch: 'liz-testings' + sha: '${{ github.event.pull_request.head.sha }}' - - name: Get short SHA + - name: "Get short SHA" run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_ENV + + - name: "Test Auth" + uses: ./.github/actions/test-auth + with: + image-tag: "${short_sha}" - - name: Build and push - uses: ./.github/actions/build-push + - name: "GOOGLE AUTH" + id: "auth" + uses: "google-github-actions/auth@v2" with: - image-tag: "${short_sha}" - \ No newline at end of file + workload_identity_provider: "${{ vars.SHARED_WIF_PROVIDER }}" + service_account: "${{ vars.SHARED_WIF_SERVICE_ACCOUNT }}" + + diff --git a/pipe/exo/exo2_calibration_conversion.json b/pipe/exo/exo2_calibration_conversion.json index fa9e39793..2f99ce23a 100644 --- a/pipe/exo/exo2_calibration_conversion.json +++ b/pipe/exo/exo2_calibration_conversion.json @@ -14,10 +14,7 @@ "TermFuncUcrt=depth:def.ucrt.meas.mult", "TermQf=depth" ], - "image": "quay.io/battelleecology/neon-is-cal-conv-r:v1.0.8", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-cal-conv:sha-ef296df", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/exo/exoconductivity_calibration_conversion.json b/pipe/exo/exoconductivity_calibration_conversion.json index 90e5e6cb1..b61b4efd6 100644 --- a/pipe/exo/exoconductivity_calibration_conversion.json +++ b/pipe/exo/exoconductivity_calibration_conversion.json @@ -14,10 +14,7 @@ "TermFuncUcrt=temperature:def.ucrt.wq.temp.conc|specific_conductance:def.ucrt.meas.mult", "TermQf=specific_conductance" ], - "image": "quay.io/battelleecology/neon-is-cal-conv-r:v1.0.8", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-cal-conv:sha-ef296df", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/exo/exodissolvedoxygen_calibration_conversion.json b/pipe/exo/exodissolvedoxygen_calibration_conversion.json index 747f75d17..50a3f2092 100644 --- a/pipe/exo/exodissolvedoxygen_calibration_conversion.json +++ b/pipe/exo/exodissolvedoxygen_calibration_conversion.json @@ -14,10 +14,7 @@ "TermQf=dissolved_oxygen_saturation", "TermFuncUcrt=dissolved_oxygen:def.ucrt.wq.do.conc|dissolved_oxygen_saturation:def.ucrt.meas.mult" ], - "image": "quay.io/battelleecology/neon-is-cal-conv-r:v1.0.8", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-cal-conv:sha-ef296df", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/exo/exofdom_calibration_conversion.json b/pipe/exo/exofdom_calibration_conversion.json index 1409908bb..06bafd683 100644 --- a/pipe/exo/exofdom_calibration_conversion.json +++ b/pipe/exo/exofdom_calibration_conversion.json @@ -15,10 +15,7 @@ "TermQf=fdom_qsu", "DirSubCopy=calibration" ], - "image": "quay.io/battelleecology/neon-is-cal-conv-r:v1.0.8", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-cal-conv:sha-ef296df", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/exo/exophorp_calibration_conversion.json b/pipe/exo/exophorp_calibration_conversion.json index 6c82f6259..9da2c927b 100644 --- a/pipe/exo/exophorp_calibration_conversion.json +++ b/pipe/exo/exophorp_calibration_conversion.json @@ -14,10 +14,7 @@ "TermFuncUcrt=ph:def.ucrt.meas.mult", "TermQf=ph" ], - "image": "quay.io/battelleecology/neon-is-cal-conv-r:v1.0.8", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-cal-conv:sha-ef296df", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/exo/exototalalgae_calibration_conversion.json b/pipe/exo/exototalalgae_calibration_conversion.json index 131e5e84d..87c091a84 100644 --- a/pipe/exo/exototalalgae_calibration_conversion.json +++ b/pipe/exo/exototalalgae_calibration_conversion.json @@ -14,10 +14,7 @@ "TermFuncUcrt=blue_green_algae_phycoerythrin:def.ucrt.meas.mult", "TermQf=blue_green_algae_phycoerythrin" ], - "image": "quay.io/battelleecology/neon-is-cal-conv-r:v1.0.8", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-cal-conv:sha-ef296df", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/exo/exoturbidity_calibration_conversion.json b/pipe/exo/exoturbidity_calibration_conversion.json index 11f9ca396..73a2cb2a0 100644 --- a/pipe/exo/exoturbidity_calibration_conversion.json +++ b/pipe/exo/exoturbidity_calibration_conversion.json @@ -14,10 +14,7 @@ "TermFuncUcrt=turbidity:def.ucrt.meas.mult", "TermQf=turbidity" ], - "image": "quay.io/battelleecology/neon-is-cal-conv-r:v1.0.8", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-cal-conv:sha-ef296df", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/tchain/tchain_calibration_conversion.yaml b/pipe/tchain/tchain_calibration_conversion.yaml index 2d5a4b232..0c1367c22 100644 --- a/pipe/tchain/tchain_calibration_conversion.yaml +++ b/pipe/tchain/tchain_calibration_conversion.yaml @@ -13,9 +13,9 @@ transform: - TermFuncConv=depth0WaterTemp:def.cal.conv.poly|depth1WaterTemp:def.cal.conv.poly|depth2WaterTemp:def.cal.conv.poly|depth3WaterTemp:def.cal.conv.poly|depth4WaterTemp:def.cal.conv.poly|depth5WaterTemp:def.cal.conv.poly|depth6WaterTemp:def.cal.conv.poly|depth7WaterTemp:def.cal.conv.poly|depth8WaterTemp:def.cal.conv.poly|depth9WaterTemp:def.cal.conv.poly|depth10WaterTemp:def.cal.conv.poly - TermQf=depth0WaterTemp|depth1WaterTemp|depth2WaterTemp|depth3WaterTemp|depth4WaterTemp|depth5WaterTemp|depth6WaterTemp|depth7WaterTemp|depth8WaterTemp|depth9WaterTemp|depth10WaterTemp - TermFuncUcrt=depth0WaterTemp:def.ucrt.meas.cnst|depth1WaterTemp:def.ucrt.meas.cnst|depth2WaterTemp:def.ucrt.meas.cnst|depth3WaterTemp:def.ucrt.meas.cnst|depth4WaterTemp:def.ucrt.meas.cnst|depth5WaterTemp:def.ucrt.meas.cnst|depth6WaterTemp:def.ucrt.meas.cnst|depth7WaterTemp:def.ucrt.meas.cnst|depth8WaterTemp:def.ucrt.meas.cnst|depth9WaterTemp:def.ucrt.meas.cnst|depth10WaterTemp:def.ucrt.meas.cnst - image: quay.io/battelleecology/neon-is-cal-conv-r:d2426683 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-cal-conv:sha-ef296df + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO PARALLELIZATION_INTERNAL: '1' From a05097db7d029aebc4a52e3973cb101e3ae7707f Mon Sep 17 00:00:00 2001 From: choim Date: Tue, 5 Nov 2024 09:02:59 -0700 Subject: [PATCH 06/26] flow.loc.data.trnc.comb build_tag_push_update removed --- flow/flow.loc.data.trnc.comb/build_tag_push_update.sh | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100755 flow/flow.loc.data.trnc.comb/build_tag_push_update.sh diff --git a/flow/flow.loc.data.trnc.comb/build_tag_push_update.sh b/flow/flow.loc.data.trnc.comb/build_tag_push_update.sh deleted file mode 100755 index 02c9d033a..000000000 --- a/flow/flow.loc.data.trnc.comb/build_tag_push_update.sh +++ /dev/null @@ -1,11 +0,0 @@ -# Run from root repository (NEON-IS-data-processing) -#!/usr/bin/env bash -image_name=neon-is-loc-data-trnc-comb-r -tag=$(git rev-parse --short HEAD) -cd ./flow/flow.loc.data.trnc.comb -docker build -t $image_name:latest . -docker tag $image_name quay.io/battelleecology/$image_name:$tag -docker push quay.io/battelleecology/$image_name:$tag -cd ../.. - -Rscript ./utilities/flow.img.updt.R "./pipe" ".yaml" "quay.io/battelleecology/$image_name" "$tag" From 7a70ff9c9c90a5fec843e58173e0b9c42d2ad8ab Mon Sep 17 00:00:00 2001 From: choim Date: Tue, 5 Nov 2024 09:05:11 -0700 Subject: [PATCH 07/26] flow.loc.data.trnc.comb Dockerfile modified --- flow/flow.loc.data.trnc.comb/Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/flow/flow.loc.data.trnc.comb/Dockerfile b/flow/flow.loc.data.trnc.comb/Dockerfile index c9209402c..96edfec1b 100644 --- a/flow/flow.loc.data.trnc.comb/Dockerfile +++ b/flow/flow.loc.data.trnc.comb/Dockerfile @@ -3,12 +3,15 @@ # Start with the base image. FROM us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-pack-base-r:v1.4.7 +ARG FLOW_DIR="./flow" +ARG APP_DIR="flow.loc.data.trnc.comb" + # maintainer handle MAINTAINER "Cove Sturtevant" csturtevant@battelleecology.org # Copy the lockfile and restore known working versions of R dependency packages # ENSURE that the renv.lock file is up-to-date and thus has all listed dependencies prior to creating this docker image -COPY ./renv.lock /renv.lock +COPY ${FLOW_DIR}/${APP_DIR}/renv.lock /renv.lock RUN R -e 'renv::restore(lockfile="/renv.lock")' # Create app user @@ -17,8 +20,8 @@ RUN groupadd app && \ WORKDIR /home/app # Copy in application code -COPY ./flow.loc.data.trnc.comb.R . -COPY ./wrap.loc.data.trnc.comb.R . +COPY ${FLOW_DIR}/${APP_DIR}/flow.loc.data.trnc.comb.R . +COPY ${FLOW_DIR}/${APP_DIR}/wrap.loc.data.trnc.comb.R . # Run as app user RUN chown app:app -R /home/app From adb7ace21f10ce1644b6f117f32f5a3f53867638 Mon Sep 17 00:00:00 2001 From: choim Date: Tue, 5 Nov 2024 09:12:19 -0700 Subject: [PATCH 08/26] testing flow.loc.data.trnc.comb buil-push --- .github/workflows/neon-test-auth.yml | 50 +++++++++++++--------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/.github/workflows/neon-test-auth.yml b/.github/workflows/neon-test-auth.yml index 40d2083e0..2b16cf414 100644 --- a/.github/workflows/neon-test-auth.yml +++ b/.github/workflows/neon-test-auth.yml @@ -1,7 +1,12 @@ -name: "Test Google SA Auth" +name: "Build-push_flow.loc.data.trnc.comb" on: - workflow_dispatch: + push: + branches: + - 'master' + paths: + - 'flow/flow.loc.data.trnc.comb/**' + workflow_dispatch: {} # Allows trigger of workflow from web interface env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }} @@ -9,43 +14,34 @@ env: GHCR_REGISTRY: ghcr.io GCP_ARTIFACT_HOST: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev GCP_REGISTRY: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev/${{ vars.SHARED_WIF_PROJECT }}/${{ vars.SHARED_WIF_REPO }} + GCP_PROVIDER: ${{ vars.SHARED_WIF_PROVIDER }} + GCP_SERVICE_ACCOUNT: ${{ vars.SHARED_WIF_SERVICE_ACCOUNT }} GHCR_NS: battelleecology # Use docker.io for Docker Hub if empty REGISTRY: ghcr.io - # github.repository as / - # IMAGE_NAME: ${{ github.repository }} - # Get just the repo name from the event + # Get just the repo name from the event, i.e., NEON-IS-data-processing REPO_NAME: ${{ github.event.repository.name }} - + # IS module name + MODULE_PATH: ./flow/flow.loc.data.trnc.comb + IMAGE_NAME: neon-is-loc-data-trnc-comb + jobs: - deploy: + build-push: runs-on: ubuntu-latest - permissions: # Read more at : https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs + permissions: contents: 'write' id-token: 'write' steps: - name: "Checkout" - uses: actions/checkout@v4.1.4 - - - name: "Checkout Branch" - uses: peterjgrainger/action-create-branch@v2.2.0 + uses: "actions/checkout@v4.1.4" with: - branch: 'liz-testings' - sha: '${{ github.event.pull_request.head.sha }}' + fetch-depth: '0' - - name: "Get short SHA" + - name: Get short SHA run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_ENV - - - name: "Test Auth" - uses: ./.github/actions/test-auth - with: - image-tag: "${short_sha}" - - name: "GOOGLE AUTH" - id: "auth" - uses: "google-github-actions/auth@v2" + - name: Build and push + uses: ./.github/actions/build-push with: - workload_identity_provider: "${{ vars.SHARED_WIF_PROVIDER }}" - service_account: "${{ vars.SHARED_WIF_SERVICE_ACCOUNT }}" - - + image-tag: "${short_sha}" + \ No newline at end of file From 9b510cfa70e43cf4aa17e2b59ca9f4bc54143f63 Mon Sep 17 00:00:00 2001 From: choim Date: Tue, 5 Nov 2024 09:25:26 -0700 Subject: [PATCH 09/26] flow.loc.data.trnc.comb build-push and updated added --- .../build_push_loc.data.trnc.comb.yml | 47 +++++++++++++++++ .../build_push_update_loc.data.trnc.comb.yml | 51 +++++++++++++++++++ .github/workflows/neon-test-auth.yml | 50 +++++++++--------- 3 files changed, 125 insertions(+), 23 deletions(-) create mode 100644 .github/workflows/build_push_loc.data.trnc.comb.yml create mode 100644 .github/workflows/build_push_update_loc.data.trnc.comb.yml diff --git a/.github/workflows/build_push_loc.data.trnc.comb.yml b/.github/workflows/build_push_loc.data.trnc.comb.yml new file mode 100644 index 000000000..2b16cf414 --- /dev/null +++ b/.github/workflows/build_push_loc.data.trnc.comb.yml @@ -0,0 +1,47 @@ +name: "Build-push_flow.loc.data.trnc.comb" + +on: + push: + branches: + - 'master' + paths: + - 'flow/flow.loc.data.trnc.comb/**' + workflow_dispatch: {} # Allows trigger of workflow from web interface + +env: + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }} + # Use github and google registries + GHCR_REGISTRY: ghcr.io + GCP_ARTIFACT_HOST: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev + GCP_REGISTRY: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev/${{ vars.SHARED_WIF_PROJECT }}/${{ vars.SHARED_WIF_REPO }} + GCP_PROVIDER: ${{ vars.SHARED_WIF_PROVIDER }} + GCP_SERVICE_ACCOUNT: ${{ vars.SHARED_WIF_SERVICE_ACCOUNT }} + GHCR_NS: battelleecology + # Use docker.io for Docker Hub if empty + REGISTRY: ghcr.io + # Get just the repo name from the event, i.e., NEON-IS-data-processing + REPO_NAME: ${{ github.event.repository.name }} + # IS module name + MODULE_PATH: ./flow/flow.loc.data.trnc.comb + IMAGE_NAME: neon-is-loc-data-trnc-comb + +jobs: + build-push: + runs-on: ubuntu-latest + permissions: + contents: 'write' + id-token: 'write' + steps: + - name: "Checkout" + uses: "actions/checkout@v4.1.4" + with: + fetch-depth: '0' + + - name: Get short SHA + run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_ENV + + - name: Build and push + uses: ./.github/actions/build-push + with: + image-tag: "${short_sha}" + \ No newline at end of file diff --git a/.github/workflows/build_push_update_loc.data.trnc.comb.yml b/.github/workflows/build_push_update_loc.data.trnc.comb.yml new file mode 100644 index 000000000..309595696 --- /dev/null +++ b/.github/workflows/build_push_update_loc.data.trnc.comb.yml @@ -0,0 +1,51 @@ +name: "Build-push-update_flow.loc.data.trnc.comb" + +on: + push: + # branches: + # - 'master' + tags: + - "flow.loc.data.trnc.comb/v*.*.*" +env: + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # Use github and google registries + GHCR_REGISTRY: ghcr.io + GCP_ARTIFACT_HOST: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev + GCP_REGISTRY: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev/${{ vars.SHARED_WIF_PROJECT }}/${{ vars.SHARED_WIF_REPO }} + GCP_PROVIDER: ${{ vars.SHARED_WIF_PROVIDER }} + GCP_SERVICE_ACCOUNT: ${{ vars.SHARED_WIF_SERVICE_ACCOUNT }} + GHCR_NS: battelleecology + # Use docker.io for Docker Hub if empty + REGISTRY: ghcr.io + # github.repository as / + # IMAGE_NAME: ${{ github.repository }} + # Get just the repo name from the event, i.e., NEON-IS-data-processing + REPO_NAME: ${{ github.event.repository.name }} + # IS module name + MODULE_PATH: ./flow/flow.loc.data.trnc.comb + IMAGE_NAME: neon-is-loc-data-trnc-comb + +jobs: + build-push-update: + runs-on: ubuntu-latest + permissions: + contents: 'write' + id-token: 'write' + pull-requests: 'write' + + steps: + - name: "Checkout" + uses: "actions/checkout@v4.1.4" + with: + ref: 'master' + fetch-depth: '0' + + - name: Get short SHA + run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_ENV + + - name: Get semver + run: echo "semver=$(git describe --tags --abbrev=0 --match=flow.loc.data.trnc.comb/v*.*.* | awk -F "/" '{print $2}')" >> $GITHUB_ENV + + - name: Build push and update + uses: ./.github/actions/build-push-update diff --git a/.github/workflows/neon-test-auth.yml b/.github/workflows/neon-test-auth.yml index 2b16cf414..40d2083e0 100644 --- a/.github/workflows/neon-test-auth.yml +++ b/.github/workflows/neon-test-auth.yml @@ -1,12 +1,7 @@ -name: "Build-push_flow.loc.data.trnc.comb" +name: "Test Google SA Auth" on: - push: - branches: - - 'master' - paths: - - 'flow/flow.loc.data.trnc.comb/**' - workflow_dispatch: {} # Allows trigger of workflow from web interface + workflow_dispatch: env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }} @@ -14,34 +9,43 @@ env: GHCR_REGISTRY: ghcr.io GCP_ARTIFACT_HOST: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev GCP_REGISTRY: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev/${{ vars.SHARED_WIF_PROJECT }}/${{ vars.SHARED_WIF_REPO }} - GCP_PROVIDER: ${{ vars.SHARED_WIF_PROVIDER }} - GCP_SERVICE_ACCOUNT: ${{ vars.SHARED_WIF_SERVICE_ACCOUNT }} GHCR_NS: battelleecology # Use docker.io for Docker Hub if empty REGISTRY: ghcr.io - # Get just the repo name from the event, i.e., NEON-IS-data-processing + # github.repository as / + # IMAGE_NAME: ${{ github.repository }} + # Get just the repo name from the event REPO_NAME: ${{ github.event.repository.name }} - # IS module name - MODULE_PATH: ./flow/flow.loc.data.trnc.comb - IMAGE_NAME: neon-is-loc-data-trnc-comb - + jobs: - build-push: + deploy: runs-on: ubuntu-latest - permissions: + permissions: # Read more at : https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs contents: 'write' id-token: 'write' steps: - name: "Checkout" - uses: "actions/checkout@v4.1.4" + uses: actions/checkout@v4.1.4 + + - name: "Checkout Branch" + uses: peterjgrainger/action-create-branch@v2.2.0 with: - fetch-depth: '0' + branch: 'liz-testings' + sha: '${{ github.event.pull_request.head.sha }}' - - name: Get short SHA + - name: "Get short SHA" run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_ENV + + - name: "Test Auth" + uses: ./.github/actions/test-auth + with: + image-tag: "${short_sha}" - - name: Build and push - uses: ./.github/actions/build-push + - name: "GOOGLE AUTH" + id: "auth" + uses: "google-github-actions/auth@v2" with: - image-tag: "${short_sha}" - \ No newline at end of file + workload_identity_provider: "${{ vars.SHARED_WIF_PROVIDER }}" + service_account: "${{ vars.SHARED_WIF_SERVICE_ACCOUNT }}" + + From 30fbca05483534fb1fba41b312e355cedf65a61e Mon Sep 17 00:00:00 2001 From: choim Date: Tue, 5 Nov 2024 09:33:23 -0700 Subject: [PATCH 10/26] flow.loc.data.trnc.comb pipeline yaml modified --- pipe/exo/exo2_merge_data_by_location.json | 5 +---- pipe/exo/exoconductivity_merge_data_by_location.json | 5 +---- pipe/exo/exodissolvedoxygen_merge_data_by_location.json | 5 +---- pipe/exo/exofdom_merge_data_by_location.json | 5 +---- pipe/exo/exophorp_merge_data_by_location.json | 5 +---- pipe/exo/exototalalgae_merge_data_by_location.json | 5 +---- pipe/exo/exoturbidity_merge_data_by_location.json | 5 +---- pipe/sunav2/sunav2_merge_data_by_location.json | 5 +---- pipe/tchain/tchain_merge_data_by_location.yaml | 6 +++--- 9 files changed, 11 insertions(+), 35 deletions(-) diff --git a/pipe/exo/exo2_merge_data_by_location.json b/pipe/exo/exo2_merge_data_by_location.json index 1b6dfe0c2..46568ea25 100644 --- a/pipe/exo/exo2_merge_data_by_location.json +++ b/pipe/exo/exo2_merge_data_by_location.json @@ -13,10 +13,7 @@ "DirSubCombUcrt=uncertainty_coef", "DirSubCopy=location" ], - "image": "quay.io/battelleecology/neon-is-loc-data-trnc-comb-r:v1.0.2", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-data-trnc-comb:sha-adb7ace", "env": { "LOG_LEVEL": "INFO", "PARALLELIZATION_INTERNAL": "1" diff --git a/pipe/exo/exoconductivity_merge_data_by_location.json b/pipe/exo/exoconductivity_merge_data_by_location.json index c452cc635..1a89ed95e 100644 --- a/pipe/exo/exoconductivity_merge_data_by_location.json +++ b/pipe/exo/exoconductivity_merge_data_by_location.json @@ -13,10 +13,7 @@ "DirSubCombUcrt=uncertainty_coef", "DirSubCopy=location" ], - "image": "quay.io/battelleecology/neon-is-loc-data-trnc-comb-r:v1.0.2", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-data-trnc-comb:sha-adb7ace", "env": { "LOG_LEVEL": "INFO", "PARALLELIZATION_INTERNAL": "1" diff --git a/pipe/exo/exodissolvedoxygen_merge_data_by_location.json b/pipe/exo/exodissolvedoxygen_merge_data_by_location.json index 879f4dcf6..002042bae 100644 --- a/pipe/exo/exodissolvedoxygen_merge_data_by_location.json +++ b/pipe/exo/exodissolvedoxygen_merge_data_by_location.json @@ -13,10 +13,7 @@ "DirSubCombUcrt=uncertainty_coef", "DirSubCopy=location" ], - "image": "quay.io/battelleecology/neon-is-loc-data-trnc-comb-r:v1.0.2", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-data-trnc-comb:sha-adb7ace", "env": { "LOG_LEVEL": "INFO", "PARALLELIZATION_INTERNAL": "1" diff --git a/pipe/exo/exofdom_merge_data_by_location.json b/pipe/exo/exofdom_merge_data_by_location.json index a6fa8f5fd..c87c334d5 100644 --- a/pipe/exo/exofdom_merge_data_by_location.json +++ b/pipe/exo/exofdom_merge_data_by_location.json @@ -13,10 +13,7 @@ "DirSubCombUcrt=uncertainty_coef", "DirSubCopy=location" ], - "image": "quay.io/battelleecology/neon-is-loc-data-trnc-comb-r:v1.0.2", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-data-trnc-comb:sha-adb7ace", "env": { "LOG_LEVEL": "INFO", "PARALLELIZATION_INTERNAL": "1" diff --git a/pipe/exo/exophorp_merge_data_by_location.json b/pipe/exo/exophorp_merge_data_by_location.json index a9d318583..c50aafabc 100644 --- a/pipe/exo/exophorp_merge_data_by_location.json +++ b/pipe/exo/exophorp_merge_data_by_location.json @@ -13,10 +13,7 @@ "DirSubCombUcrt=uncertainty_coef", "DirSubCopy=location" ], - "image": "quay.io/battelleecology/neon-is-loc-data-trnc-comb-r:v1.0.2", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-data-trnc-comb:sha-adb7ace", "env": { "LOG_LEVEL": "INFO", "PARALLELIZATION_INTERNAL": "1" diff --git a/pipe/exo/exototalalgae_merge_data_by_location.json b/pipe/exo/exototalalgae_merge_data_by_location.json index 5afca5405..4f8317bf5 100644 --- a/pipe/exo/exototalalgae_merge_data_by_location.json +++ b/pipe/exo/exototalalgae_merge_data_by_location.json @@ -13,10 +13,7 @@ "DirSubCombUcrt=uncertainty_coef", "DirSubCopy=location" ], - "image": "quay.io/battelleecology/neon-is-loc-data-trnc-comb-r:v1.0.2", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-data-trnc-comb:sha-adb7ace", "env": { "LOG_LEVEL": "INFO", "PARALLELIZATION_INTERNAL": "1" diff --git a/pipe/exo/exoturbidity_merge_data_by_location.json b/pipe/exo/exoturbidity_merge_data_by_location.json index 0c239050c..73ee47f4b 100644 --- a/pipe/exo/exoturbidity_merge_data_by_location.json +++ b/pipe/exo/exoturbidity_merge_data_by_location.json @@ -13,10 +13,7 @@ "DirSubCombUcrt=uncertainty_coef", "DirSubCopy=location" ], - "image": "quay.io/battelleecology/neon-is-loc-data-trnc-comb-r:v1.0.2", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-data-trnc-comb:sha-adb7ace", "env": { "LOG_LEVEL": "INFO", "PARALLELIZATION_INTERNAL": "1" diff --git a/pipe/sunav2/sunav2_merge_data_by_location.json b/pipe/sunav2/sunav2_merge_data_by_location.json index 94ec1331a..f4a81e9eb 100644 --- a/pipe/sunav2/sunav2_merge_data_by_location.json +++ b/pipe/sunav2/sunav2_merge_data_by_location.json @@ -12,10 +12,7 @@ "DirSubCombData=data", "DirSubCopy=location|calibration" ], - "image": "quay.io/battelleecology/neon-is-loc-data-trnc-comb-r:v1.0.2", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-data-trnc-comb:sha-adb7ace", "env": { "LOG_LEVEL": "INFO", "PARALLELIZATION_INTERNAL": "1" diff --git a/pipe/tchain/tchain_merge_data_by_location.yaml b/pipe/tchain/tchain_merge_data_by_location.yaml index 63edf2a1f..6782cba14 100644 --- a/pipe/tchain/tchain_merge_data_by_location.yaml +++ b/pipe/tchain/tchain_merge_data_by_location.yaml @@ -11,9 +11,9 @@ transform: - DirSubCombData=data|flags|uncertainty_data - DirSubCombUcrt=uncertainty_coef - DirSubCopy=location - image: quay.io/battelleecology/neon-is-loc-data-trnc-comb-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-data-trnc-comb:sha-adb7ace + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO PARALLELIZATION_INTERNAL: '1' From 85dc0113d03ece47b80101be886ee893621d1612 Mon Sep 17 00:00:00 2001 From: choim Date: Wed, 6 Nov 2024 12:28:30 -0700 Subject: [PATCH 11/26] flow.data.comb.ts build_tag_push_update script removed --- flow/flow.data.comb.ts/build_tag_push_update.sh | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100755 flow/flow.data.comb.ts/build_tag_push_update.sh diff --git a/flow/flow.data.comb.ts/build_tag_push_update.sh b/flow/flow.data.comb.ts/build_tag_push_update.sh deleted file mode 100755 index 960fced36..000000000 --- a/flow/flow.data.comb.ts/build_tag_push_update.sh +++ /dev/null @@ -1,11 +0,0 @@ -# Run from root repository (NEON-IS-data-processing) -#!/usr/bin/env bash -image_name=neon-is-data-comb-ts-r -tag=$(git rev-parse --short HEAD) -cd ./flow/flow.data.comb.ts -docker build -t $image_name:latest . -docker tag $image_name quay.io/battelleecology/$image_name:$tag -docker push quay.io/battelleecology/$image_name:$tag -cd ../.. - -Rscript ./utilities/flow.img.updt.R "./pipe" ".yaml" "quay.io/battelleecology/$image_name" "$tag" From d80ddccb90fe3381dcca8244aa92ce4a75344e1e Mon Sep 17 00:00:00 2001 From: choim Date: Wed, 6 Nov 2024 12:46:42 -0700 Subject: [PATCH 12/26] flow.data.comb.ts/Dockerfile --- flow/flow.data.comb.ts/Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/flow/flow.data.comb.ts/Dockerfile b/flow/flow.data.comb.ts/Dockerfile index 302f56763..b9f33e6bb 100644 --- a/flow/flow.data.comb.ts/Dockerfile +++ b/flow/flow.data.comb.ts/Dockerfile @@ -3,12 +3,15 @@ # Start with the base image. FROM us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-pack-base-r:v1.4.7 +ARG FLOW_DIR="./flow" +ARG APP_DIR="flow.data.comb.ts" + # maintainer handle MAINTAINER "Cove Sturtevant" csturtevant@battelleecology.org # Copy the lockfile and restore known working versions of R dependency packages # ENSURE that the renv.lock file is up-to-date and thus has all listed dependencies prior to creating this docker image -COPY ./renv.lock /renv.lock +COPY ${FLOW_DIR}/${APP_DIR}/renv.lock /renv.lock RUN R -e 'renv::restore(lockfile="/renv.lock")' # Create app user @@ -17,8 +20,8 @@ RUN groupadd app && \ WORKDIR /home/app # Copy in application code -COPY ./wrap.data.comb.ts.R . -COPY ./flow.data.comb.ts.R . +COPY ${FLOW_DIR}/${APP_DIR}/wrap.data.comb.ts.R . +COPY ${FLOW_DIR}/${APP_DIR}/flow.data.comb.ts.R . # Run as app user RUN chown app:app -R /home/app From fa1d23ea8bba2a0b209e91502d4d2768073801c3 Mon Sep 17 00:00:00 2001 From: choim Date: Wed, 6 Nov 2024 12:57:46 -0700 Subject: [PATCH 13/26] testing flow.data.comb.ts build-push --- .github/workflows/neon-test-auth.yml | 52 ++++++++++++++-------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/neon-test-auth.yml b/.github/workflows/neon-test-auth.yml index 40d2083e0..cdabded3f 100644 --- a/.github/workflows/neon-test-auth.yml +++ b/.github/workflows/neon-test-auth.yml @@ -1,51 +1,51 @@ -name: "Test Google SA Auth" +name: "Build-push-update_flow.data.comb.ts" on: - workflow_dispatch: - + push: + # branches: + # - 'master' + tags: + - "flow.data.comb.ts/v*.*.*" env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Use github and google registries GHCR_REGISTRY: ghcr.io GCP_ARTIFACT_HOST: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev GCP_REGISTRY: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev/${{ vars.SHARED_WIF_PROJECT }}/${{ vars.SHARED_WIF_REPO }} + GCP_PROVIDER: ${{ vars.SHARED_WIF_PROVIDER }} + GCP_SERVICE_ACCOUNT: ${{ vars.SHARED_WIF_SERVICE_ACCOUNT }} GHCR_NS: battelleecology # Use docker.io for Docker Hub if empty REGISTRY: ghcr.io # github.repository as / # IMAGE_NAME: ${{ github.repository }} - # Get just the repo name from the event + # Get just the repo name from the event, i.e., NEON-IS-data-processing REPO_NAME: ${{ github.event.repository.name }} - + # IS module name + MODULE_PATH: ./flow/flow.data.comb.ts + IMAGE_NAME: neon-is-data-comb-ts + jobs: - deploy: + build-push-update: runs-on: ubuntu-latest - permissions: # Read more at : https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs + permissions: contents: 'write' id-token: 'write' + pull-requests: 'write' + steps: - name: "Checkout" - uses: actions/checkout@v4.1.4 - - - name: "Checkout Branch" - uses: peterjgrainger/action-create-branch@v2.2.0 + uses: "actions/checkout@v4.1.4" with: - branch: 'liz-testings' - sha: '${{ github.event.pull_request.head.sha }}' + ref: 'master' + fetch-depth: '0' - - name: "Get short SHA" + - name: Get short SHA run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_ENV - - - name: "Test Auth" - uses: ./.github/actions/test-auth - with: - image-tag: "${short_sha}" - - - name: "GOOGLE AUTH" - id: "auth" - uses: "google-github-actions/auth@v2" - with: - workload_identity_provider: "${{ vars.SHARED_WIF_PROVIDER }}" - service_account: "${{ vars.SHARED_WIF_SERVICE_ACCOUNT }}" + - name: Get semver + run: echo "semver=$(git describe --tags --abbrev=0 --match=flow.data.comb.ts/v*.*.* | awk -F "/" '{print $2}')" >> $GITHUB_ENV + - name: Build push and update + uses: ./.github/actions/build-push-update From d78c3095d32b36e3e1483bd5d813018fc51a9cd4 Mon Sep 17 00:00:00 2001 From: choim Date: Wed, 6 Nov 2024 13:02:17 -0700 Subject: [PATCH 14/26] testing flow.data.comb.ts build-push #2 --- .github/workflows/neon-test-auth.yml | 30 ++++++++++++---------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/.github/workflows/neon-test-auth.yml b/.github/workflows/neon-test-auth.yml index cdabded3f..b6afd9909 100644 --- a/.github/workflows/neon-test-auth.yml +++ b/.github/workflows/neon-test-auth.yml @@ -1,14 +1,15 @@ -name: "Build-push-update_flow.data.comb.ts" +name: "Build-push_flow.data.comb.ts" on: push: - # branches: - # - 'master' - tags: - - "flow.data.comb.ts/v*.*.*" + branches: + - 'master' + paths: + - 'flow/flow.data.comb.ts/**' + workflow_dispatch: {} # Allows trigger of workflow from web interface + env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }} - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Use github and google registries GHCR_REGISTRY: ghcr.io GCP_ARTIFACT_HOST: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev @@ -18,8 +19,6 @@ env: GHCR_NS: battelleecology # Use docker.io for Docker Hub if empty REGISTRY: ghcr.io - # github.repository as / - # IMAGE_NAME: ${{ github.repository }} # Get just the repo name from the event, i.e., NEON-IS-data-processing REPO_NAME: ${{ github.event.repository.name }} # IS module name @@ -27,25 +26,22 @@ env: IMAGE_NAME: neon-is-data-comb-ts jobs: - build-push-update: + build-push: runs-on: ubuntu-latest permissions: contents: 'write' id-token: 'write' - pull-requests: 'write' - steps: - name: "Checkout" uses: "actions/checkout@v4.1.4" with: - ref: 'master' fetch-depth: '0' - name: Get short SHA run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_ENV - - name: Get semver - run: echo "semver=$(git describe --tags --abbrev=0 --match=flow.data.comb.ts/v*.*.* | awk -F "/" '{print $2}')" >> $GITHUB_ENV - - - name: Build push and update - uses: ./.github/actions/build-push-update + - name: Build and push + uses: ./.github/actions/build-push + with: + image-tag: "${short_sha}" + \ No newline at end of file From b4b218aa9ce67dbca80504dec3dc38dcc64ae30d Mon Sep 17 00:00:00 2001 From: choim Date: Wed, 6 Nov 2024 14:31:09 -0700 Subject: [PATCH 15/26] flow.data.comb.ts build-push and update added --- .github/workflows/build_push_data.comb.ts.yml | 47 +++++++++++++++++ .../build_push_update_data.comb.ts.yml | 51 +++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 .github/workflows/build_push_data.comb.ts.yml create mode 100644 .github/workflows/build_push_update_data.comb.ts.yml diff --git a/.github/workflows/build_push_data.comb.ts.yml b/.github/workflows/build_push_data.comb.ts.yml new file mode 100644 index 000000000..b6afd9909 --- /dev/null +++ b/.github/workflows/build_push_data.comb.ts.yml @@ -0,0 +1,47 @@ +name: "Build-push_flow.data.comb.ts" + +on: + push: + branches: + - 'master' + paths: + - 'flow/flow.data.comb.ts/**' + workflow_dispatch: {} # Allows trigger of workflow from web interface + +env: + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }} + # Use github and google registries + GHCR_REGISTRY: ghcr.io + GCP_ARTIFACT_HOST: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev + GCP_REGISTRY: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev/${{ vars.SHARED_WIF_PROJECT }}/${{ vars.SHARED_WIF_REPO }} + GCP_PROVIDER: ${{ vars.SHARED_WIF_PROVIDER }} + GCP_SERVICE_ACCOUNT: ${{ vars.SHARED_WIF_SERVICE_ACCOUNT }} + GHCR_NS: battelleecology + # Use docker.io for Docker Hub if empty + REGISTRY: ghcr.io + # Get just the repo name from the event, i.e., NEON-IS-data-processing + REPO_NAME: ${{ github.event.repository.name }} + # IS module name + MODULE_PATH: ./flow/flow.data.comb.ts + IMAGE_NAME: neon-is-data-comb-ts + +jobs: + build-push: + runs-on: ubuntu-latest + permissions: + contents: 'write' + id-token: 'write' + steps: + - name: "Checkout" + uses: "actions/checkout@v4.1.4" + with: + fetch-depth: '0' + + - name: Get short SHA + run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_ENV + + - name: Build and push + uses: ./.github/actions/build-push + with: + image-tag: "${short_sha}" + \ No newline at end of file diff --git a/.github/workflows/build_push_update_data.comb.ts.yml b/.github/workflows/build_push_update_data.comb.ts.yml new file mode 100644 index 000000000..cdabded3f --- /dev/null +++ b/.github/workflows/build_push_update_data.comb.ts.yml @@ -0,0 +1,51 @@ +name: "Build-push-update_flow.data.comb.ts" + +on: + push: + # branches: + # - 'master' + tags: + - "flow.data.comb.ts/v*.*.*" +env: + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # Use github and google registries + GHCR_REGISTRY: ghcr.io + GCP_ARTIFACT_HOST: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev + GCP_REGISTRY: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev/${{ vars.SHARED_WIF_PROJECT }}/${{ vars.SHARED_WIF_REPO }} + GCP_PROVIDER: ${{ vars.SHARED_WIF_PROVIDER }} + GCP_SERVICE_ACCOUNT: ${{ vars.SHARED_WIF_SERVICE_ACCOUNT }} + GHCR_NS: battelleecology + # Use docker.io for Docker Hub if empty + REGISTRY: ghcr.io + # github.repository as / + # IMAGE_NAME: ${{ github.repository }} + # Get just the repo name from the event, i.e., NEON-IS-data-processing + REPO_NAME: ${{ github.event.repository.name }} + # IS module name + MODULE_PATH: ./flow/flow.data.comb.ts + IMAGE_NAME: neon-is-data-comb-ts + +jobs: + build-push-update: + runs-on: ubuntu-latest + permissions: + contents: 'write' + id-token: 'write' + pull-requests: 'write' + + steps: + - name: "Checkout" + uses: "actions/checkout@v4.1.4" + with: + ref: 'master' + fetch-depth: '0' + + - name: Get short SHA + run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_ENV + + - name: Get semver + run: echo "semver=$(git describe --tags --abbrev=0 --match=flow.data.comb.ts/v*.*.* | awk -F "/" '{print $2}')" >> $GITHUB_ENV + + - name: Build push and update + uses: ./.github/actions/build-push-update From fada744ce7703361876270af73f8820653e34152 Mon Sep 17 00:00:00 2001 From: choim Date: Wed, 6 Nov 2024 14:41:47 -0700 Subject: [PATCH 16/26] flow.data.comb.ts pipeline yaml modified --- .../tempSpecificDepthLakes_stats_instantaneous.yaml | 6 +++--- pipe/waterQuality/waterQuality_exo2_stats.json | 5 +---- pipe/waterQuality/waterQuality_exoconductivity_stats.json | 5 +---- .../waterQuality/waterQuality_exodissolvedoxygen_stats.json | 5 +---- pipe/waterQuality/waterQuality_exophorp_stats.json | 5 +---- pipe/waterQuality/waterQuality_exototalalgae_stats.json | 5 +---- pipe/waterQuality/waterQuality_exoturbidity_stats.json | 5 +---- 7 files changed, 9 insertions(+), 27 deletions(-) diff --git a/pipe/tempSpecificDepthLakes/tempSpecificDepthLakes_stats_instantaneous.yaml b/pipe/tempSpecificDepthLakes/tempSpecificDepthLakes_stats_instantaneous.yaml index 83b716beb..0b679124f 100644 --- a/pipe/tempSpecificDepthLakes/tempSpecificDepthLakes_stats_instantaneous.yaml +++ b/pipe/tempSpecificDepthLakes/tempSpecificDepthLakes_stats_instantaneous.yaml @@ -14,9 +14,9 @@ transform: - NameVarTime=readout_time - ColKeep=readout_time|timeWndwBgn|timeWndwEnd|depth0WaterTemp|depth0WaterTemp_ucrtExpn|depth1WaterTemp|depth1WaterTemp_ucrtExpn|depth2WaterTemp|depth2WaterTemp_ucrtExpn|depth3WaterTemp|depth3WaterTemp_ucrtExpn|depth4WaterTemp|depth4WaterTemp_ucrtExpn|depth5WaterTemp|depth5WaterTemp_ucrtExpn|depth6WaterTemp|depth6WaterTemp_ucrtExpn|depth7WaterTemp|depth7WaterTemp_ucrtExpn|depth8WaterTemp|depth8WaterTemp_ucrtExpn|depth9WaterTemp|depth9WaterTemp_ucrtExpn|depth10WaterTemp|depth10WaterTemp_ucrtExpn - NameFileSufx=_basicStats_001 - image: quay.io/battelleecology/neon-is-data-comb-ts-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-data-comb-ts:sha-d78c309 + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO PARALLELIZATION_INTERNAL: '1' # Parallelization within R. If increased, adjust resource requests appropriately. diff --git a/pipe/waterQuality/waterQuality_exo2_stats.json b/pipe/waterQuality/waterQuality_exo2_stats.json index b0aae8fb5..b55472dfa 100644 --- a/pipe/waterQuality/waterQuality_exo2_stats.json +++ b/pipe/waterQuality/waterQuality_exo2_stats.json @@ -16,10 +16,7 @@ "ColKeep=readout_time|readout_time|sensorDepth|sensorDepth_ucrtExpn", "NameFileSufx=_basicStats_100" ], - "image": "quay.io/battelleecology/neon-is-data-comb-ts-r:v1.0.2", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-data-comb-ts:sha-d78c309", "env": { "LOG_LEVEL": "DEBUG" } diff --git a/pipe/waterQuality/waterQuality_exoconductivity_stats.json b/pipe/waterQuality/waterQuality_exoconductivity_stats.json index 4099b0b45..fc108d1fa 100644 --- a/pipe/waterQuality/waterQuality_exoconductivity_stats.json +++ b/pipe/waterQuality/waterQuality_exoconductivity_stats.json @@ -16,10 +16,7 @@ "ColKeep=readout_time|readout_time|specificConductance|specificConductance_ucrtExpn", "NameFileSufx=_basicStats_100" ], - "image": "quay.io/battelleecology/neon-is-data-comb-ts-r:v1.0.2", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-data-comb-ts:sha-d78c309", "env": { "LOG_LEVEL": "DEBUG" } diff --git a/pipe/waterQuality/waterQuality_exodissolvedoxygen_stats.json b/pipe/waterQuality/waterQuality_exodissolvedoxygen_stats.json index 8d09ea4be..d462ed657 100644 --- a/pipe/waterQuality/waterQuality_exodissolvedoxygen_stats.json +++ b/pipe/waterQuality/waterQuality_exodissolvedoxygen_stats.json @@ -16,10 +16,7 @@ "ColKeep=readout_time|readout_time|dissolvedOxygen|dissolvedOxygen_ucrtExpn|dissolvedOxygenSaturation|dissolvedOxygenSaturation_ucrtExpn", "NameFileSufx=_basicStats_100" ], - "image": "quay.io/battelleecology/neon-is-data-comb-ts-r:v1.0.2", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-data-comb-ts:sha-d78c309", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/waterQuality/waterQuality_exophorp_stats.json b/pipe/waterQuality/waterQuality_exophorp_stats.json index c8771efb7..3ab5b6ca5 100644 --- a/pipe/waterQuality/waterQuality_exophorp_stats.json +++ b/pipe/waterQuality/waterQuality_exophorp_stats.json @@ -16,10 +16,7 @@ "ColKeep=readout_time|readout_time|pH|pH_ucrtExpn", "NameFileSufx=_basicStats_100" ], - "image": "quay.io/battelleecology/neon-is-data-comb-ts-r:v1.0.2", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-data-comb-ts:sha-d78c309", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/waterQuality/waterQuality_exototalalgae_stats.json b/pipe/waterQuality/waterQuality_exototalalgae_stats.json index 70eaa62db..f0e034148 100644 --- a/pipe/waterQuality/waterQuality_exototalalgae_stats.json +++ b/pipe/waterQuality/waterQuality_exototalalgae_stats.json @@ -16,10 +16,7 @@ "ColKeep=readout_time|readout_time|chlorophyll|chlorophyll_ucrtExpn", "NameFileSufx=_basicStats_100" ], - "image": "quay.io/battelleecology/neon-is-data-comb-ts-r:v1.0.2", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-data-comb-ts:sha-d78c309", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/waterQuality/waterQuality_exoturbidity_stats.json b/pipe/waterQuality/waterQuality_exoturbidity_stats.json index 0415eae13..a2990e0b3 100644 --- a/pipe/waterQuality/waterQuality_exoturbidity_stats.json +++ b/pipe/waterQuality/waterQuality_exoturbidity_stats.json @@ -16,10 +16,7 @@ "ColKeep=readout_time|readout_time|turbidity|turbidity_ucrtExpn", "NameFileSufx=_basicStats_100" ], - "image": "quay.io/battelleecology/neon-is-data-comb-ts-r:v1.0.2", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-data-comb-ts:sha-d78c309", "env": { "LOG_LEVEL": "INFO" } From a5e80218e5bd151ab86b3fb39a63bf30efd912e9 Mon Sep 17 00:00:00 2001 From: choim Date: Wed, 6 Nov 2024 15:12:59 -0700 Subject: [PATCH 17/26] build-push testing --- .github/workflows/neon-test-auth.yml | 48 +++++++++++++++------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/.github/workflows/neon-test-auth.yml b/.github/workflows/neon-test-auth.yml index b6afd9909..4976c5e17 100644 --- a/.github/workflows/neon-test-auth.yml +++ b/.github/workflows/neon-test-auth.yml @@ -1,12 +1,7 @@ -name: "Build-push_flow.data.comb.ts" +name: "Test Google SA Auth" on: - push: - branches: - - 'master' - paths: - - 'flow/flow.data.comb.ts/**' - workflow_dispatch: {} # Allows trigger of workflow from web interface + workflow_dispatch: env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }} @@ -14,34 +9,41 @@ env: GHCR_REGISTRY: ghcr.io GCP_ARTIFACT_HOST: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev GCP_REGISTRY: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev/${{ vars.SHARED_WIF_PROJECT }}/${{ vars.SHARED_WIF_REPO }} - GCP_PROVIDER: ${{ vars.SHARED_WIF_PROVIDER }} - GCP_SERVICE_ACCOUNT: ${{ vars.SHARED_WIF_SERVICE_ACCOUNT }} GHCR_NS: battelleecology # Use docker.io for Docker Hub if empty REGISTRY: ghcr.io - # Get just the repo name from the event, i.e., NEON-IS-data-processing + # github.repository as / + # IMAGE_NAME: ${{ github.repository }} + # Get just the repo name from the event REPO_NAME: ${{ github.event.repository.name }} - # IS module name - MODULE_PATH: ./flow/flow.data.comb.ts - IMAGE_NAME: neon-is-data-comb-ts - + jobs: - build-push: + deploy: runs-on: ubuntu-latest - permissions: + permissions: # Read more at : https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs contents: 'write' id-token: 'write' steps: - name: "Checkout" - uses: "actions/checkout@v4.1.4" + uses: actions/checkout@v4.1.4 + + - name: "Checkout Branch" + uses: peterjgrainger/action-create-branch@v2.2.0 with: - fetch-depth: '0' + branch: 'liz-testings' + sha: '${{ github.event.pull_request.head.sha }}' - - name: Get short SHA + - name: "Get short SHA" run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_ENV + + - name: "Test Auth" + uses: ./.github/actions/test-auth + with: + image-tag: "${short_sha}" - - name: Build and push - uses: ./.github/actions/build-push + - name: "GOOGLE AUTH" + id: "auth" + uses: "google-github-actions/auth@v2" with: - image-tag: "${short_sha}" - \ No newline at end of file + workload_identity_provider: "${{ vars.SHARED_WIF_PROVIDER }}" + service_account: "${{ vars.SHARED_WIF_SERVICE_ACCOUNT }}" From c9c636617c5294862b2ec0b42a95c141f059fc4f Mon Sep 17 00:00:00 2001 From: choim Date: Wed, 6 Nov 2024 15:14:35 -0700 Subject: [PATCH 18/26] format only --- .github/workflows/neon-test-auth.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/neon-test-auth.yml b/.github/workflows/neon-test-auth.yml index 4976c5e17..a30990cc1 100644 --- a/.github/workflows/neon-test-auth.yml +++ b/.github/workflows/neon-test-auth.yml @@ -47,3 +47,4 @@ jobs: with: workload_identity_provider: "${{ vars.SHARED_WIF_PROVIDER }}" service_account: "${{ vars.SHARED_WIF_SERVICE_ACCOUNT }}" + From 39abaac89dc3f3120e61925b18898ae8c200f5f2 Mon Sep 17 00:00:00 2001 From: choim Date: Wed, 6 Nov 2024 15:15:36 -0700 Subject: [PATCH 19/26] format only #2 --- .github/workflows/neon-test-auth.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/neon-test-auth.yml b/.github/workflows/neon-test-auth.yml index a30990cc1..40d2083e0 100644 --- a/.github/workflows/neon-test-auth.yml +++ b/.github/workflows/neon-test-auth.yml @@ -48,3 +48,4 @@ jobs: workload_identity_provider: "${{ vars.SHARED_WIF_PROVIDER }}" service_account: "${{ vars.SHARED_WIF_SERVICE_ACCOUNT }}" + From 0c55ce7bc8de48e85142f7b117b4d17a99ea59f3 Mon Sep 17 00:00:00 2001 From: choim Date: Wed, 6 Nov 2024 15:28:18 -0700 Subject: [PATCH 20/26] semver used in flow.cal.conv Dockerfile --- flow/flow.cal.conv/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flow/flow.cal.conv/Dockerfile b/flow/flow.cal.conv/Dockerfile index 581c58830..fc21505d0 100644 --- a/flow/flow.cal.conv/Dockerfile +++ b/flow/flow.cal.conv/Dockerfile @@ -1,7 +1,7 @@ # Dockerfile for NEON IS Data Processing - Calibration Conversion # Start with the calibration package image. -FROM us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-pack-cal-r:sha-d31a011 +FROM us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-pack-cal-r:v1.3.4 ARG FLOW_DIR="./flow" ARG APP_DIR="flow.cal.conv" From 6cee8beebdaf31d8c47222e55a84c0c6fb08946f Mon Sep 17 00:00:00 2001 From: choim Date: Wed, 6 Nov 2024 16:29:08 -0700 Subject: [PATCH 21/26] flow.loc.grp.asgn build_tag_push_update script removed --- flow/flow.loc.grp.asgn/build_tag_push_update.sh | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100755 flow/flow.loc.grp.asgn/build_tag_push_update.sh diff --git a/flow/flow.loc.grp.asgn/build_tag_push_update.sh b/flow/flow.loc.grp.asgn/build_tag_push_update.sh deleted file mode 100755 index b2635c8ca..000000000 --- a/flow/flow.loc.grp.asgn/build_tag_push_update.sh +++ /dev/null @@ -1,11 +0,0 @@ -# Run from root repository (NEON-IS-data-processing) -#!/usr/bin/env bash -image_name=neon-is-loc-grp-asgn-r -tag=$(git rev-parse --short HEAD) -cd ./flow/flow.loc.grp.asgn -docker build -t $image_name:latest . -docker tag $image_name quay.io/battelleecology/$image_name:$tag -docker push quay.io/battelleecology/$image_name:$tag -cd ../.. - -Rscript ./utilities/flow.img.updt.R "./pipe" ".yaml" "quay.io/battelleecology/$image_name" "$tag" From 04e944d4962820e9469e6b38070bdc51416309a0 Mon Sep 17 00:00:00 2001 From: choim Date: Wed, 6 Nov 2024 16:30:57 -0700 Subject: [PATCH 22/26] flow.loc.grp.asgn Dockerfile modified --- flow/flow.loc.grp.asgn/Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/flow/flow.loc.grp.asgn/Dockerfile b/flow/flow.loc.grp.asgn/Dockerfile index fdf8e9754..7d424320c 100644 --- a/flow/flow.loc.grp.asgn/Dockerfile +++ b/flow/flow.loc.grp.asgn/Dockerfile @@ -3,12 +3,15 @@ # Start with the base image. FROM us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-pack-base-r:v1.4.7 +ARG FLOW_DIR="./flow" +ARG APP_DIR="flow.loc.grp.asgn" + # maintainer handle MAINTAINER "Cove Sturtevant" csturtevant@battelleecology.org # Copy the lockfile and restore known working versions of R dependency packages # ENSURE that the renv.lock file is up-to-date and thus has all listed dependencies prior to creating this docker image -COPY ./renv.lock /renv.lock +COPY ${FLOW_DIR}/${APP_DIR}/renv.lock /renv.lock RUN R -e 'renv::restore(lockfile="/renv.lock")' # Create app user @@ -17,8 +20,8 @@ RUN groupadd app && \ WORKDIR /home/app # Copy in application code -COPY ./flow.loc.grp.asgn.R . -COPY ./wrap.loc.grp.asgn.R . +COPY ${FLOW_DIR}/${APP_DIR}/flow.loc.grp.asgn.R . +COPY ${FLOW_DIR}/${APP_DIR}/wrap.loc.grp.asgn.R . # Run as app user RUN chown app:app -R /home/app From eca53ca73bab7c022b95070323f1b15abeba7419 Mon Sep 17 00:00:00 2001 From: choim Date: Wed, 6 Nov 2024 16:33:33 -0700 Subject: [PATCH 23/26] flow.loc.grp.asgn build-push --- .github/workflows/neon-test-auth.yml | 50 +++++++++++++--------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/.github/workflows/neon-test-auth.yml b/.github/workflows/neon-test-auth.yml index 40d2083e0..0de09ebbc 100644 --- a/.github/workflows/neon-test-auth.yml +++ b/.github/workflows/neon-test-auth.yml @@ -1,7 +1,12 @@ -name: "Test Google SA Auth" +name: "Build-push_flow.loc.grp.asgn" on: - workflow_dispatch: + push: + branches: + - 'master' + paths: + - 'flow/flow.loc.grp.asgn/**' + workflow_dispatch: {} # Allows trigger of workflow from web interface env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }} @@ -9,43 +14,34 @@ env: GHCR_REGISTRY: ghcr.io GCP_ARTIFACT_HOST: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev GCP_REGISTRY: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev/${{ vars.SHARED_WIF_PROJECT }}/${{ vars.SHARED_WIF_REPO }} + GCP_PROVIDER: ${{ vars.SHARED_WIF_PROVIDER }} + GCP_SERVICE_ACCOUNT: ${{ vars.SHARED_WIF_SERVICE_ACCOUNT }} GHCR_NS: battelleecology # Use docker.io for Docker Hub if empty REGISTRY: ghcr.io - # github.repository as / - # IMAGE_NAME: ${{ github.repository }} - # Get just the repo name from the event + # Get just the repo name from the event, i.e., NEON-IS-data-processing REPO_NAME: ${{ github.event.repository.name }} - + # IS module name + MODULE_PATH: ./flow/flow.loc.grp.asgn + IMAGE_NAME: neon-is-loc-grp-asgn + jobs: - deploy: + build-push: runs-on: ubuntu-latest - permissions: # Read more at : https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs + permissions: contents: 'write' id-token: 'write' steps: - name: "Checkout" - uses: actions/checkout@v4.1.4 - - - name: "Checkout Branch" - uses: peterjgrainger/action-create-branch@v2.2.0 + uses: "actions/checkout@v4.1.4" with: - branch: 'liz-testings' - sha: '${{ github.event.pull_request.head.sha }}' + fetch-depth: '0' - - name: "Get short SHA" + - name: Get short SHA run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_ENV - - - name: "Test Auth" - uses: ./.github/actions/test-auth - with: - image-tag: "${short_sha}" - - name: "GOOGLE AUTH" - id: "auth" - uses: "google-github-actions/auth@v2" + - name: Build and push + uses: ./.github/actions/build-push with: - workload_identity_provider: "${{ vars.SHARED_WIF_PROVIDER }}" - service_account: "${{ vars.SHARED_WIF_SERVICE_ACCOUNT }}" - - + image-tag: "${short_sha}" + \ No newline at end of file From 6332a8c636922787e1c0854bc622e21304fe25c6 Mon Sep 17 00:00:00 2001 From: choim Date: Wed, 6 Nov 2024 16:40:20 -0700 Subject: [PATCH 24/26] flow.loc.grp.asgn build-push added --- .github/workflows/build_push_loc.grp.asgn.yml | 47 +++++++++++++++++ .../build_push_update_loc.grp.asgn.yml | 51 +++++++++++++++++++ .github/workflows/neon-test-auth.yml | 50 +++++++++--------- 3 files changed, 125 insertions(+), 23 deletions(-) create mode 100644 .github/workflows/build_push_loc.grp.asgn.yml create mode 100644 .github/workflows/build_push_update_loc.grp.asgn.yml diff --git a/.github/workflows/build_push_loc.grp.asgn.yml b/.github/workflows/build_push_loc.grp.asgn.yml new file mode 100644 index 000000000..0de09ebbc --- /dev/null +++ b/.github/workflows/build_push_loc.grp.asgn.yml @@ -0,0 +1,47 @@ +name: "Build-push_flow.loc.grp.asgn" + +on: + push: + branches: + - 'master' + paths: + - 'flow/flow.loc.grp.asgn/**' + workflow_dispatch: {} # Allows trigger of workflow from web interface + +env: + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }} + # Use github and google registries + GHCR_REGISTRY: ghcr.io + GCP_ARTIFACT_HOST: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev + GCP_REGISTRY: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev/${{ vars.SHARED_WIF_PROJECT }}/${{ vars.SHARED_WIF_REPO }} + GCP_PROVIDER: ${{ vars.SHARED_WIF_PROVIDER }} + GCP_SERVICE_ACCOUNT: ${{ vars.SHARED_WIF_SERVICE_ACCOUNT }} + GHCR_NS: battelleecology + # Use docker.io for Docker Hub if empty + REGISTRY: ghcr.io + # Get just the repo name from the event, i.e., NEON-IS-data-processing + REPO_NAME: ${{ github.event.repository.name }} + # IS module name + MODULE_PATH: ./flow/flow.loc.grp.asgn + IMAGE_NAME: neon-is-loc-grp-asgn + +jobs: + build-push: + runs-on: ubuntu-latest + permissions: + contents: 'write' + id-token: 'write' + steps: + - name: "Checkout" + uses: "actions/checkout@v4.1.4" + with: + fetch-depth: '0' + + - name: Get short SHA + run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_ENV + + - name: Build and push + uses: ./.github/actions/build-push + with: + image-tag: "${short_sha}" + \ No newline at end of file diff --git a/.github/workflows/build_push_update_loc.grp.asgn.yml b/.github/workflows/build_push_update_loc.grp.asgn.yml new file mode 100644 index 000000000..3b03449cd --- /dev/null +++ b/.github/workflows/build_push_update_loc.grp.asgn.yml @@ -0,0 +1,51 @@ +name: "Build-push-update_flow.loc.grp.asgn" + +on: + push: + # branches: + # - 'master' + tags: + - "flow.loc.grp.asgn/v*.*.*" +env: + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # Use github and google registries + GHCR_REGISTRY: ghcr.io + GCP_ARTIFACT_HOST: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev + GCP_REGISTRY: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev/${{ vars.SHARED_WIF_PROJECT }}/${{ vars.SHARED_WIF_REPO }} + GCP_PROVIDER: ${{ vars.SHARED_WIF_PROVIDER }} + GCP_SERVICE_ACCOUNT: ${{ vars.SHARED_WIF_SERVICE_ACCOUNT }} + GHCR_NS: battelleecology + # Use docker.io for Docker Hub if empty + REGISTRY: ghcr.io + # github.repository as / + # IMAGE_NAME: ${{ github.repository }} + # Get just the repo name from the event, i.e., NEON-IS-data-processing + REPO_NAME: ${{ github.event.repository.name }} + # IS module name + MODULE_PATH: ./flow/flow.loc.grp.asgn + IMAGE_NAME: neon-is-loc-grp-asgn + +jobs: + build-push-update: + runs-on: ubuntu-latest + permissions: + contents: 'write' + id-token: 'write' + pull-requests: 'write' + + steps: + - name: "Checkout" + uses: "actions/checkout@v4.1.4" + with: + ref: 'master' + fetch-depth: '0' + + - name: Get short SHA + run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_ENV + + - name: Get semver + run: echo "semver=$(git describe --tags --abbrev=0 --match=flow.loc.grp.asgn/v*.*.* | awk -F "/" '{print $2}')" >> $GITHUB_ENV + + - name: Build push and update + uses: ./.github/actions/build-push-update diff --git a/.github/workflows/neon-test-auth.yml b/.github/workflows/neon-test-auth.yml index 0de09ebbc..40d2083e0 100644 --- a/.github/workflows/neon-test-auth.yml +++ b/.github/workflows/neon-test-auth.yml @@ -1,12 +1,7 @@ -name: "Build-push_flow.loc.grp.asgn" +name: "Test Google SA Auth" on: - push: - branches: - - 'master' - paths: - - 'flow/flow.loc.grp.asgn/**' - workflow_dispatch: {} # Allows trigger of workflow from web interface + workflow_dispatch: env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }} @@ -14,34 +9,43 @@ env: GHCR_REGISTRY: ghcr.io GCP_ARTIFACT_HOST: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev GCP_REGISTRY: ${{ vars.SHARED_WIF_LOCATON }}-docker.pkg.dev/${{ vars.SHARED_WIF_PROJECT }}/${{ vars.SHARED_WIF_REPO }} - GCP_PROVIDER: ${{ vars.SHARED_WIF_PROVIDER }} - GCP_SERVICE_ACCOUNT: ${{ vars.SHARED_WIF_SERVICE_ACCOUNT }} GHCR_NS: battelleecology # Use docker.io for Docker Hub if empty REGISTRY: ghcr.io - # Get just the repo name from the event, i.e., NEON-IS-data-processing + # github.repository as / + # IMAGE_NAME: ${{ github.repository }} + # Get just the repo name from the event REPO_NAME: ${{ github.event.repository.name }} - # IS module name - MODULE_PATH: ./flow/flow.loc.grp.asgn - IMAGE_NAME: neon-is-loc-grp-asgn - + jobs: - build-push: + deploy: runs-on: ubuntu-latest - permissions: + permissions: # Read more at : https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs contents: 'write' id-token: 'write' steps: - name: "Checkout" - uses: "actions/checkout@v4.1.4" + uses: actions/checkout@v4.1.4 + + - name: "Checkout Branch" + uses: peterjgrainger/action-create-branch@v2.2.0 with: - fetch-depth: '0' + branch: 'liz-testings' + sha: '${{ github.event.pull_request.head.sha }}' - - name: Get short SHA + - name: "Get short SHA" run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_ENV + + - name: "Test Auth" + uses: ./.github/actions/test-auth + with: + image-tag: "${short_sha}" - - name: Build and push - uses: ./.github/actions/build-push + - name: "GOOGLE AUTH" + id: "auth" + uses: "google-github-actions/auth@v2" with: - image-tag: "${short_sha}" - \ No newline at end of file + workload_identity_provider: "${{ vars.SHARED_WIF_PROVIDER }}" + service_account: "${{ vars.SHARED_WIF_SERVICE_ACCOUNT }}" + + From 18e4b52d7d859048ab5e027c11f49587a0ad59f7 Mon Sep 17 00:00:00 2001 From: choim Date: Wed, 6 Nov 2024 17:01:44 -0700 Subject: [PATCH 25/26] flow.loc.grp.asgn pipeline yaml modified --- .../aepg600m/aepg600m_location_active_dates_assignment.yaml | 6 +++--- pipe/aepg600m/aepg600m_location_asset_assignment.yaml | 6 +++--- pipe/csat3/csat3_location_active_dates_assignment.yaml | 6 +++--- pipe/csat3/csat3_location_asset_assignment.yaml | 6 +++--- pipe/dualfan/dualfan_location_active_dates_assignment.yaml | 6 +++--- pipe/dualfan/dualfan_location_asset_assignment.yaml | 6 +++--- pipe/exo/exo2_location_active_dates_assignment.json | 5 +---- pipe/exo/exo2_location_asset_assignment.json | 5 +---- .../exoconductivity_location_active_dates_assignment.json | 5 +---- pipe/exo/exoconductivity_location_asset_assignment.json | 5 +---- ...exodissolvedoxygen_location_active_dates_assignment.json | 5 +---- pipe/exo/exodissolvedoxygen_location_asset_assignment.json | 5 +---- pipe/exo/exofdom_location_active_dates_assignment.json | 5 +---- pipe/exo/exofdom_location_asset_assignment.json | 5 +---- pipe/exo/exophorp_location_active_dates_assignment.json | 5 +---- pipe/exo/exototalalgae_location_asset_assignment.json | 5 +---- pipe/exo/exoturbidity_location_active_dates_assignment.json | 5 +---- pipe/exo/exoturbidity_location_asset_assignment.json | 5 +---- pipe/gascylinder/gascylinder_location_asset_assignment.yaml | 6 +++--- .../groundwaterPhysical_group_assignment.yaml | 6 +++--- pipe/hmp155/hmp155_location_active_dates_assignment.yaml | 6 +++--- pipe/hmp155/hmp155_location_asset_assignment.yaml | 6 +++--- pipe/li191r/li191r_location_active_dates_assignment.yaml | 6 +++--- pipe/li191r/li191r_location_asset_assignment.yaml | 6 +++--- pipe/li7200/li7200_location_active_dates_assignment.yaml | 6 +++--- .../mcseries/mcseries_location_active_dates_assignment.yaml | 6 +++--- pipe/mcseries/mcseries_location_asset_assignment.yaml | 6 +++--- .../metone370380_location_active_dates_assignment.yaml | 6 +++--- .../metone370380_location_asset_assignment.yaml | 6 +++--- .../mti300ahrs_location_active_dates_assignment.yaml | 6 +++--- pipe/mti300ahrs/mti300ahrs_location_asset_assignment.yaml | 6 +++--- pipe/parQuantumLine/parQuantumLine_group_assignment.yaml | 6 +++--- pipe/parWaterSurface/parWaterSurface_group_assignment.yaml | 6 +++--- 33 files changed, 75 insertions(+), 111 deletions(-) diff --git a/pipe/aepg600m/aepg600m_location_active_dates_assignment.yaml b/pipe/aepg600m/aepg600m_location_active_dates_assignment.yaml index 90f39f2a4..5f89aa8a6 100644 --- a/pipe/aepg600m/aepg600m_location_active_dates_assignment.yaml +++ b/pipe/aepg600m/aepg600m_location_active_dates_assignment.yaml @@ -14,9 +14,9 @@ transform: FileYear=$FILE_YEAR TypeFile=namedLocation "Prop=HOR|VER|name|description|site|Data Rate|active_periods" - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/aepg600m/aepg600m_location_asset_assignment.yaml b/pipe/aepg600m/aepg600m_location_asset_assignment.yaml index 52af7251d..8160d3b1f 100644 --- a/pipe/aepg600m/aepg600m_location_asset_assignment.yaml +++ b/pipe/aepg600m/aepg600m_location_asset_assignment.yaml @@ -14,9 +14,9 @@ transform: FileYear=$FILE_YEAR TypeFile=asset "Prop=HOR|VER|install_date|remove_date|name|site|Data Rate" - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/csat3/csat3_location_active_dates_assignment.yaml b/pipe/csat3/csat3_location_active_dates_assignment.yaml index c8d0c3930..dc6f79525 100644 --- a/pipe/csat3/csat3_location_active_dates_assignment.yaml +++ b/pipe/csat3/csat3_location_active_dates_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=namedLocation - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: DEBUG input: diff --git a/pipe/csat3/csat3_location_asset_assignment.yaml b/pipe/csat3/csat3_location_asset_assignment.yaml index a36fe81d7..3bc16f8ed 100644 --- a/pipe/csat3/csat3_location_asset_assignment.yaml +++ b/pipe/csat3/csat3_location_asset_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=asset - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: DEBUG input: diff --git a/pipe/dualfan/dualfan_location_active_dates_assignment.yaml b/pipe/dualfan/dualfan_location_active_dates_assignment.yaml index 670d46cb4..c03ef495e 100644 --- a/pipe/dualfan/dualfan_location_active_dates_assignment.yaml +++ b/pipe/dualfan/dualfan_location_active_dates_assignment.yaml @@ -14,9 +14,9 @@ transform: FileYear=$FILE_YEAR TypeFile=namedLocation "Prop=HOR|VER|name|description|site|Data Rate|active_periods" - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/dualfan/dualfan_location_asset_assignment.yaml b/pipe/dualfan/dualfan_location_asset_assignment.yaml index 564330acb..1156f68a8 100644 --- a/pipe/dualfan/dualfan_location_asset_assignment.yaml +++ b/pipe/dualfan/dualfan_location_asset_assignment.yaml @@ -14,9 +14,9 @@ transform: FileYear=$FILE_YEAR TypeFile=asset "Prop=HOR|VER|install_date|remove_date|name|site|Data Rate" - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/exo/exo2_location_active_dates_assignment.json b/pipe/exo/exo2_location_active_dates_assignment.json index 1d57858dc..b8e871d50 100644 --- a/pipe/exo/exo2_location_active_dates_assignment.json +++ b/pipe/exo/exo2_location_active_dates_assignment.json @@ -12,10 +12,7 @@ "FileYear=$FILE_YEAR", "TypeFile=namedLocation" ], - "image": "quay.io/battelleecology/neon-is-loc-grp-asgn-r:v1.0.5", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/exo/exo2_location_asset_assignment.json b/pipe/exo/exo2_location_asset_assignment.json index b8a1e3c1f..0806dabed 100644 --- a/pipe/exo/exo2_location_asset_assignment.json +++ b/pipe/exo/exo2_location_asset_assignment.json @@ -12,10 +12,7 @@ "FileYear=$FILE_YEAR", "TypeFile=asset" ], - "image": "quay.io/battelleecology/neon-is-loc-grp-asgn-r:v1.0.5", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/exo/exoconductivity_location_active_dates_assignment.json b/pipe/exo/exoconductivity_location_active_dates_assignment.json index 5a1914690..e14219093 100644 --- a/pipe/exo/exoconductivity_location_active_dates_assignment.json +++ b/pipe/exo/exoconductivity_location_active_dates_assignment.json @@ -12,10 +12,7 @@ "FileYear=$FILE_YEAR", "TypeFile=namedLocation" ], - "image": "quay.io/battelleecology/neon-is-loc-grp-asgn-r:v1.0.5", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/exo/exoconductivity_location_asset_assignment.json b/pipe/exo/exoconductivity_location_asset_assignment.json index 4786783f1..87258ab55 100644 --- a/pipe/exo/exoconductivity_location_asset_assignment.json +++ b/pipe/exo/exoconductivity_location_asset_assignment.json @@ -12,10 +12,7 @@ "FileYear=$FILE_YEAR", "TypeFile=asset" ], - "image": "quay.io/battelleecology/neon-is-loc-grp-asgn-r:v1.0.5", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/exo/exodissolvedoxygen_location_active_dates_assignment.json b/pipe/exo/exodissolvedoxygen_location_active_dates_assignment.json index dee95ffe6..b3efb84dc 100644 --- a/pipe/exo/exodissolvedoxygen_location_active_dates_assignment.json +++ b/pipe/exo/exodissolvedoxygen_location_active_dates_assignment.json @@ -12,10 +12,7 @@ "FileYear=$FILE_YEAR", "TypeFile=namedLocation" ], - "image": "quay.io/battelleecology/neon-is-loc-grp-asgn-r:v1.0.5", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/exo/exodissolvedoxygen_location_asset_assignment.json b/pipe/exo/exodissolvedoxygen_location_asset_assignment.json index 7abc847af..58d637adf 100644 --- a/pipe/exo/exodissolvedoxygen_location_asset_assignment.json +++ b/pipe/exo/exodissolvedoxygen_location_asset_assignment.json @@ -12,10 +12,7 @@ "FileYear=$FILE_YEAR", "TypeFile=asset" ], - "image": "quay.io/battelleecology/neon-is-loc-grp-asgn-r:v1.0.5", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/exo/exofdom_location_active_dates_assignment.json b/pipe/exo/exofdom_location_active_dates_assignment.json index 867ad75af..0675ca4c9 100644 --- a/pipe/exo/exofdom_location_active_dates_assignment.json +++ b/pipe/exo/exofdom_location_active_dates_assignment.json @@ -12,10 +12,7 @@ "FileYear=$FILE_YEAR", "TypeFile=namedLocation" ], - "image": "quay.io/battelleecology/neon-is-loc-grp-asgn-r:v1.0.5", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca5", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/exo/exofdom_location_asset_assignment.json b/pipe/exo/exofdom_location_asset_assignment.json index e6fb1808b..0742155fb 100644 --- a/pipe/exo/exofdom_location_asset_assignment.json +++ b/pipe/exo/exofdom_location_asset_assignment.json @@ -12,10 +12,7 @@ "FileYear=$FILE_YEAR", "TypeFile=asset" ], - "image": "quay.io/battelleecology/neon-is-loc-grp-asgn-r:v1.0.5", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/exo/exophorp_location_active_dates_assignment.json b/pipe/exo/exophorp_location_active_dates_assignment.json index 25b1d2869..ebf3932e9 100644 --- a/pipe/exo/exophorp_location_active_dates_assignment.json +++ b/pipe/exo/exophorp_location_active_dates_assignment.json @@ -12,10 +12,7 @@ "FileYear=$FILE_YEAR", "TypeFile=namedLocation" ], - "image": "quay.io/battelleecology/neon-is-loc-grp-asgn-r:v1.0.5", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/exo/exototalalgae_location_asset_assignment.json b/pipe/exo/exototalalgae_location_asset_assignment.json index 37c5590eb..d5f390128 100644 --- a/pipe/exo/exototalalgae_location_asset_assignment.json +++ b/pipe/exo/exototalalgae_location_asset_assignment.json @@ -12,10 +12,7 @@ "FileYear=$FILE_YEAR", "TypeFile=asset" ], - "image": "quay.io/battelleecology/neon-is-loc-grp-asgn-r:v1.0.5", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/exo/exoturbidity_location_active_dates_assignment.json b/pipe/exo/exoturbidity_location_active_dates_assignment.json index 26a9bc3a5..f54184434 100644 --- a/pipe/exo/exoturbidity_location_active_dates_assignment.json +++ b/pipe/exo/exoturbidity_location_active_dates_assignment.json @@ -12,10 +12,7 @@ "FileYear=$FILE_YEAR", "TypeFile=namedLocation" ], - "image": "quay.io/battelleecology/neon-is-loc-grp-asgn-r:v1.0.5", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/exo/exoturbidity_location_asset_assignment.json b/pipe/exo/exoturbidity_location_asset_assignment.json index ab89f1364..2f4d180d7 100644 --- a/pipe/exo/exoturbidity_location_asset_assignment.json +++ b/pipe/exo/exoturbidity_location_asset_assignment.json @@ -12,10 +12,7 @@ "FileYear=$FILE_YEAR", "TypeFile=asset" ], - "image": "quay.io/battelleecology/neon-is-loc-grp-asgn-r:v1.0.5", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/gascylinder/gascylinder_location_asset_assignment.yaml b/pipe/gascylinder/gascylinder_location_asset_assignment.yaml index e3865518e..5f5def3d3 100644 --- a/pipe/gascylinder/gascylinder_location_asset_assignment.yaml +++ b/pipe/gascylinder/gascylinder_location_asset_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=asset - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/groundwaterPhysical/groundwaterPhysical_group_assignment.yaml b/pipe/groundwaterPhysical/groundwaterPhysical_group_assignment.yaml index aad9f84c2..ab0b0302b 100644 --- a/pipe/groundwaterPhysical/groundwaterPhysical_group_assignment.yaml +++ b/pipe/groundwaterPhysical/groundwaterPhysical_group_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=group - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/hmp155/hmp155_location_active_dates_assignment.yaml b/pipe/hmp155/hmp155_location_active_dates_assignment.yaml index 36dcec0fc..6c11d08ba 100644 --- a/pipe/hmp155/hmp155_location_active_dates_assignment.yaml +++ b/pipe/hmp155/hmp155_location_active_dates_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=namedLocation - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/hmp155/hmp155_location_asset_assignment.yaml b/pipe/hmp155/hmp155_location_asset_assignment.yaml index eb9e10390..59a21252d 100644 --- a/pipe/hmp155/hmp155_location_asset_assignment.yaml +++ b/pipe/hmp155/hmp155_location_asset_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=asset - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/li191r/li191r_location_active_dates_assignment.yaml b/pipe/li191r/li191r_location_active_dates_assignment.yaml index 2d83faf3f..766f6628c 100644 --- a/pipe/li191r/li191r_location_active_dates_assignment.yaml +++ b/pipe/li191r/li191r_location_active_dates_assignment.yaml @@ -14,9 +14,9 @@ transform: FileYear=$FILE_YEAR TypeFile=namedLocation "Prop=HOR|VER|name|description|site|Data Rate|active_periods" - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/li191r/li191r_location_asset_assignment.yaml b/pipe/li191r/li191r_location_asset_assignment.yaml index bfe1c541e..a8b49b575 100644 --- a/pipe/li191r/li191r_location_asset_assignment.yaml +++ b/pipe/li191r/li191r_location_asset_assignment.yaml @@ -14,9 +14,9 @@ transform: FileYear=$FILE_YEAR TypeFile=asset "Prop=HOR|VER|install_date|remove_date|name|site|Data Rate" - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/li7200/li7200_location_active_dates_assignment.yaml b/pipe/li7200/li7200_location_active_dates_assignment.yaml index a6b8d88f6..d3e4b98f8 100644 --- a/pipe/li7200/li7200_location_active_dates_assignment.yaml +++ b/pipe/li7200/li7200_location_active_dates_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=namedLocation - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/mcseries/mcseries_location_active_dates_assignment.yaml b/pipe/mcseries/mcseries_location_active_dates_assignment.yaml index 02597fc60..127ae2848 100644 --- a/pipe/mcseries/mcseries_location_active_dates_assignment.yaml +++ b/pipe/mcseries/mcseries_location_active_dates_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=namedLocation - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: DEBUG input: diff --git a/pipe/mcseries/mcseries_location_asset_assignment.yaml b/pipe/mcseries/mcseries_location_asset_assignment.yaml index ede7cddcd..170ba85ec 100644 --- a/pipe/mcseries/mcseries_location_asset_assignment.yaml +++ b/pipe/mcseries/mcseries_location_asset_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=asset - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/metone370380/metone370380_location_active_dates_assignment.yaml b/pipe/metone370380/metone370380_location_active_dates_assignment.yaml index b5c6981b7..685a6ee7f 100644 --- a/pipe/metone370380/metone370380_location_active_dates_assignment.yaml +++ b/pipe/metone370380/metone370380_location_active_dates_assignment.yaml @@ -14,9 +14,9 @@ transform: FileYear=$FILE_YEAR TypeFile=namedLocation "Prop=HOR|VER|name|description|site|Data Rate|active_periods" - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/metone370380/metone370380_location_asset_assignment.yaml b/pipe/metone370380/metone370380_location_asset_assignment.yaml index c0811c7ee..2df43cdf4 100644 --- a/pipe/metone370380/metone370380_location_asset_assignment.yaml +++ b/pipe/metone370380/metone370380_location_asset_assignment.yaml @@ -14,9 +14,9 @@ transform: FileYear=$FILE_YEAR TypeFile=asset "Prop=HOR|VER|install_date|remove_date|name|site|Data Rate" - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/mti300ahrs/mti300ahrs_location_active_dates_assignment.yaml b/pipe/mti300ahrs/mti300ahrs_location_active_dates_assignment.yaml index 4fd6b0027..a056e0f7a 100644 --- a/pipe/mti300ahrs/mti300ahrs_location_active_dates_assignment.yaml +++ b/pipe/mti300ahrs/mti300ahrs_location_active_dates_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=namedLocation - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/mti300ahrs/mti300ahrs_location_asset_assignment.yaml b/pipe/mti300ahrs/mti300ahrs_location_asset_assignment.yaml index c8813102d..e75c69f22 100644 --- a/pipe/mti300ahrs/mti300ahrs_location_asset_assignment.yaml +++ b/pipe/mti300ahrs/mti300ahrs_location_asset_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=asset - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/parQuantumLine/parQuantumLine_group_assignment.yaml b/pipe/parQuantumLine/parQuantumLine_group_assignment.yaml index 79234d353..d575b3953 100644 --- a/pipe/parQuantumLine/parQuantumLine_group_assignment.yaml +++ b/pipe/parQuantumLine/parQuantumLine_group_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=group - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/parWaterSurface/parWaterSurface_group_assignment.yaml b/pipe/parWaterSurface/parWaterSurface_group_assignment.yaml index 83a2a82eb..835bb000e 100644 --- a/pipe/parWaterSurface/parWaterSurface_group_assignment.yaml +++ b/pipe/parWaterSurface/parWaterSurface_group_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=group - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: From 4bc6778e8584aa51bb7a3ddf3ffd73f5579ec95f Mon Sep 17 00:00:00 2001 From: choim Date: Thu, 7 Nov 2024 04:53:50 -0700 Subject: [PATCH 26/26] flow.loc.grp.asgn pipeline yaml modified #2 --- pipe/exo/exophorp_location_asset_assignment.json | 5 +---- .../exo/exototalalgae_location_active_dates_assignment.json | 5 +---- pipe/li7200/li7200_location_asset_assignment.yaml | 6 +++--- pipe/pqs1/pqs1_location_active_dates_assignment.yaml | 6 +++--- pipe/pqs1/pqs1_location_asset_assignment.yaml | 6 +++--- pipe/precipWeighing/precipWeighing_group_assignment.yaml | 6 +++--- pipe/pressureAir/pressureAir_group_assignment.yaml | 6 +++--- ...pressuretransducer_location_active_dates_assignment.yaml | 2 +- .../pressuretransducer_location_asset_assignment.yaml | 2 +- pipe/prt/prt_location_active_dates_assignment.yaml | 6 +++--- pipe/prt/prt_location_asset_assignment.yaml | 2 +- pipe/ptb330a/ptb330a_location_active_dates_assignment.yaml | 6 +++--- pipe/ptb330a/ptb330a_location_asset_assignment.yaml | 6 +++--- pipe/relHumidity/relHumidity_group_assignment.yaml | 6 +++--- pipe/sandbox/group_assignment_test.yaml | 6 +++--- pipe/sunav2/sunav2_location_active_dates_assignment.json | 5 +---- pipe/sunav2/sunav2_location_asset_assignment.json | 5 +---- .../surfacewaterPhysical_group_assignment.yaml | 6 +++--- pipe/tchain/tchain_location_active_dates_assignment.yaml | 6 +++--- pipe/tchain/tchain_location_asset_assignment.yaml | 6 +++--- pipe/tempAirSingle/tempAirSingle_group_assignment.yaml | 6 +++--- pipe/tempSoil/tempSoil_group_assignment.yaml | 6 +++--- .../tempSurfacewater/tempSurfacewater_group_assignment.yaml | 6 +++--- pipe/troll/troll_location_active_dates_assignment.yaml | 6 +++--- pipe/troll/troll_location_asset_assignment.yaml | 6 +++--- pipe/turbulent/turbulent_group_assignment.yaml | 4 ++-- .../windobserverii_location_active_dates_assignment.yaml | 6 +++--- .../windobserverii_location_asset_assignment.yaml | 6 +++--- 28 files changed, 69 insertions(+), 81 deletions(-) diff --git a/pipe/exo/exophorp_location_asset_assignment.json b/pipe/exo/exophorp_location_asset_assignment.json index c6bdf48d3..1041c8f7c 100644 --- a/pipe/exo/exophorp_location_asset_assignment.json +++ b/pipe/exo/exophorp_location_asset_assignment.json @@ -12,10 +12,7 @@ "FileYear=$FILE_YEAR", "TypeFile=asset" ], - "image": "quay.io/battelleecology/neon-is-loc-grp-asgn-r:v1.0.5", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/exo/exototalalgae_location_active_dates_assignment.json b/pipe/exo/exototalalgae_location_active_dates_assignment.json index 4f1a91dc5..3e5c9cd2c 100644 --- a/pipe/exo/exototalalgae_location_active_dates_assignment.json +++ b/pipe/exo/exototalalgae_location_active_dates_assignment.json @@ -12,10 +12,7 @@ "FileYear=$FILE_YEAR", "TypeFile=namedLocation" ], - "image": "quay.io/battelleecology/neon-is-loc-grp-asgn-r:v1.0.5", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/li7200/li7200_location_asset_assignment.yaml b/pipe/li7200/li7200_location_asset_assignment.yaml index 0b5ab54b5..e2cd49d27 100644 --- a/pipe/li7200/li7200_location_asset_assignment.yaml +++ b/pipe/li7200/li7200_location_asset_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=asset - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/pqs1/pqs1_location_active_dates_assignment.yaml b/pipe/pqs1/pqs1_location_active_dates_assignment.yaml index 23305da01..9cca6bc12 100644 --- a/pipe/pqs1/pqs1_location_active_dates_assignment.yaml +++ b/pipe/pqs1/pqs1_location_active_dates_assignment.yaml @@ -14,9 +14,9 @@ transform: FileYear=$FILE_YEAR TypeFile=namedLocation "Prop=HOR|VER|name|description|site|Data Rate|active_periods|context" - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/pqs1/pqs1_location_asset_assignment.yaml b/pipe/pqs1/pqs1_location_asset_assignment.yaml index c7c647d69..bb62455f8 100644 --- a/pipe/pqs1/pqs1_location_asset_assignment.yaml +++ b/pipe/pqs1/pqs1_location_asset_assignment.yaml @@ -14,9 +14,9 @@ transform: FileYear=$FILE_YEAR TypeFile=asset "Prop=HOR|VER|install_date|remove_date|name|site|Data Rate|context" - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/precipWeighing/precipWeighing_group_assignment.yaml b/pipe/precipWeighing/precipWeighing_group_assignment.yaml index a60c79981..b371ef3a0 100644 --- a/pipe/precipWeighing/precipWeighing_group_assignment.yaml +++ b/pipe/precipWeighing/precipWeighing_group_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=group - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/pressureAir/pressureAir_group_assignment.yaml b/pipe/pressureAir/pressureAir_group_assignment.yaml index 9311e7f2b..a4039e49c 100644 --- a/pipe/pressureAir/pressureAir_group_assignment.yaml +++ b/pipe/pressureAir/pressureAir_group_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=group - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/pressuretransducer/pressuretransducer_location_active_dates_assignment.yaml b/pipe/pressuretransducer/pressuretransducer_location_active_dates_assignment.yaml index 109da698f..3306058ba 100644 --- a/pipe/pressuretransducer/pressuretransducer_location_active_dates_assignment.yaml +++ b/pipe/pressuretransducer/pressuretransducer_location_active_dates_assignment.yaml @@ -13,7 +13,7 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=namedLocation - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca image_pull_secrets: - battelleecology-quay-read-all-pull-secret env: diff --git a/pipe/pressuretransducer/pressuretransducer_location_asset_assignment.yaml b/pipe/pressuretransducer/pressuretransducer_location_asset_assignment.yaml index 700484e9f..6038cf975 100644 --- a/pipe/pressuretransducer/pressuretransducer_location_asset_assignment.yaml +++ b/pipe/pressuretransducer/pressuretransducer_location_asset_assignment.yaml @@ -13,7 +13,7 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=asset - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca image_pull_secrets: - battelleecology-quay-read-all-pull-secret env: diff --git a/pipe/prt/prt_location_active_dates_assignment.yaml b/pipe/prt/prt_location_active_dates_assignment.yaml index 4eab100a0..b277b4d05 100644 --- a/pipe/prt/prt_location_active_dates_assignment.yaml +++ b/pipe/prt/prt_location_active_dates_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=namedLocation - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/prt/prt_location_asset_assignment.yaml b/pipe/prt/prt_location_asset_assignment.yaml index 821f4471d..86ffb055f 100644 --- a/pipe/prt/prt_location_asset_assignment.yaml +++ b/pipe/prt/prt_location_asset_assignment.yaml @@ -13,7 +13,7 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=asset - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca image_pull_secrets: - battelleecology-quay-read-all-pull-secret env: diff --git a/pipe/ptb330a/ptb330a_location_active_dates_assignment.yaml b/pipe/ptb330a/ptb330a_location_active_dates_assignment.yaml index 405e2d554..126b95ddc 100644 --- a/pipe/ptb330a/ptb330a_location_active_dates_assignment.yaml +++ b/pipe/ptb330a/ptb330a_location_active_dates_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=namedLocation - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/ptb330a/ptb330a_location_asset_assignment.yaml b/pipe/ptb330a/ptb330a_location_asset_assignment.yaml index 2486f1a21..e68a25e94 100644 --- a/pipe/ptb330a/ptb330a_location_asset_assignment.yaml +++ b/pipe/ptb330a/ptb330a_location_asset_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=asset - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/relHumidity/relHumidity_group_assignment.yaml b/pipe/relHumidity/relHumidity_group_assignment.yaml index c6b943ee4..8f1275afd 100644 --- a/pipe/relHumidity/relHumidity_group_assignment.yaml +++ b/pipe/relHumidity/relHumidity_group_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=group - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/sandbox/group_assignment_test.yaml b/pipe/sandbox/group_assignment_test.yaml index fbfaf34cc..3930777aa 100644 --- a/pipe/sandbox/group_assignment_test.yaml +++ b/pipe/sandbox/group_assignment_test.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=group - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/sunav2/sunav2_location_active_dates_assignment.json b/pipe/sunav2/sunav2_location_active_dates_assignment.json index 53fe2707a..ebaca1fb7 100644 --- a/pipe/sunav2/sunav2_location_active_dates_assignment.json +++ b/pipe/sunav2/sunav2_location_active_dates_assignment.json @@ -12,10 +12,7 @@ "FileYear=$FILE_YEAR", "TypeFile=namedLocation" ], - "image": "quay.io/battelleecology/neon-is-loc-grp-asgn-r:v1.0.5", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/sunav2/sunav2_location_asset_assignment.json b/pipe/sunav2/sunav2_location_asset_assignment.json index bdd851528..f980abe46 100644 --- a/pipe/sunav2/sunav2_location_asset_assignment.json +++ b/pipe/sunav2/sunav2_location_asset_assignment.json @@ -12,10 +12,7 @@ "FileYear=$FILE_YEAR", "TypeFile=asset" ], - "image": "quay.io/battelleecology/neon-is-loc-grp-asgn-r:v1.0.5", - "image_pull_secrets": [ - "battelleecology-quay-read-all-pull-secret" - ], + "image": "us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca", "env": { "LOG_LEVEL": "INFO" } diff --git a/pipe/surfacewaterPhysical/surfacewaterPhysical_group_assignment.yaml b/pipe/surfacewaterPhysical/surfacewaterPhysical_group_assignment.yaml index e72c43976..d0b23aedf 100644 --- a/pipe/surfacewaterPhysical/surfacewaterPhysical_group_assignment.yaml +++ b/pipe/surfacewaterPhysical/surfacewaterPhysical_group_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=group - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/tchain/tchain_location_active_dates_assignment.yaml b/pipe/tchain/tchain_location_active_dates_assignment.yaml index e407b8829..72b44767c 100644 --- a/pipe/tchain/tchain_location_active_dates_assignment.yaml +++ b/pipe/tchain/tchain_location_active_dates_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=namedLocation - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/tchain/tchain_location_asset_assignment.yaml b/pipe/tchain/tchain_location_asset_assignment.yaml index 2c7f6132d..0eb7c9022 100644 --- a/pipe/tchain/tchain_location_asset_assignment.yaml +++ b/pipe/tchain/tchain_location_asset_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=asset - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/tempAirSingle/tempAirSingle_group_assignment.yaml b/pipe/tempAirSingle/tempAirSingle_group_assignment.yaml index b7d448a75..ab9187b54 100644 --- a/pipe/tempAirSingle/tempAirSingle_group_assignment.yaml +++ b/pipe/tempAirSingle/tempAirSingle_group_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=group - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/tempSoil/tempSoil_group_assignment.yaml b/pipe/tempSoil/tempSoil_group_assignment.yaml index ca0f893b7..45e4a621f 100644 --- a/pipe/tempSoil/tempSoil_group_assignment.yaml +++ b/pipe/tempSoil/tempSoil_group_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=group - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/tempSurfacewater/tempSurfacewater_group_assignment.yaml b/pipe/tempSurfacewater/tempSurfacewater_group_assignment.yaml index 5672540d7..1484ed3f0 100644 --- a/pipe/tempSurfacewater/tempSurfacewater_group_assignment.yaml +++ b/pipe/tempSurfacewater/tempSurfacewater_group_assignment.yaml @@ -13,9 +13,9 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=group - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/troll/troll_location_active_dates_assignment.yaml b/pipe/troll/troll_location_active_dates_assignment.yaml index ae8665cb7..426ba50d9 100644 --- a/pipe/troll/troll_location_active_dates_assignment.yaml +++ b/pipe/troll/troll_location_active_dates_assignment.yaml @@ -14,9 +14,9 @@ transform: FileYear=$FILE_YEAR TypeFile=namedLocation "Prop=HOR|VER|name|description|site|Data Rate|active_periods" - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/troll/troll_location_asset_assignment.yaml b/pipe/troll/troll_location_asset_assignment.yaml index edf244448..3071dcb07 100644 --- a/pipe/troll/troll_location_asset_assignment.yaml +++ b/pipe/troll/troll_location_asset_assignment.yaml @@ -14,9 +14,9 @@ transform: FileYear=$FILE_YEAR TypeFile=asset "Prop=HOR|VER|install_date|remove_date|name|site|Data Rate|locations|context" - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/turbulent/turbulent_group_assignment.yaml b/pipe/turbulent/turbulent_group_assignment.yaml index 9577eb061..f4e76e45b 100644 --- a/pipe/turbulent/turbulent_group_assignment.yaml +++ b/pipe/turbulent/turbulent_group_assignment.yaml @@ -13,8 +13,8 @@ transform: DirErr=$ERR_PATH FileYear=$FILE_YEAR TypeFile=group - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: [battelleecology-quay-read-all-pull-secret] + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: [battelleecology-quay-read-all-pull-secret] env: LOG_LEVEL: INFO input: diff --git a/pipe/windobserverii/windobserverii_location_active_dates_assignment.yaml b/pipe/windobserverii/windobserverii_location_active_dates_assignment.yaml index b8306e118..79e7b1703 100644 --- a/pipe/windobserverii/windobserverii_location_active_dates_assignment.yaml +++ b/pipe/windobserverii/windobserverii_location_active_dates_assignment.yaml @@ -14,9 +14,9 @@ transform: FileYear=$FILE_YEAR TypeFile=namedLocation "Prop=HOR|VER|name|description|site|Data Rate|active_periods" - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: diff --git a/pipe/windobserverii/windobserverii_location_asset_assignment.yaml b/pipe/windobserverii/windobserverii_location_asset_assignment.yaml index 89f9b4eb7..3f103ff09 100644 --- a/pipe/windobserverii/windobserverii_location_asset_assignment.yaml +++ b/pipe/windobserverii/windobserverii_location_asset_assignment.yaml @@ -14,9 +14,9 @@ transform: FileYear=$FILE_YEAR TypeFile=asset "Prop=HOR|VER|install_date|remove_date|name|site|Data Rate|locations" - image: quay.io/battelleecology/neon-is-loc-grp-asgn-r:aa651ed4 - image_pull_secrets: - - battelleecology-quay-read-all-pull-secret + image: us-central1-docker.pkg.dev/neon-shared-service/neonscience/neon-is-loc-grp-asgn:sha-eca53ca + # image_pull_secrets: + # - battelleecology-quay-read-all-pull-secret env: LOG_LEVEL: INFO input: