From bb6770f95d8a0b43f71b8fd1b9aeb0faafe2842b Mon Sep 17 00:00:00 2001
From: Adam Lerman <awlerma@uwe.nsa.gov>
Date: Fri, 27 Sep 2024 15:27:59 +0000
Subject: [PATCH] test

---
 .github/workflows/build-accumulo.yml                | 13 ++++++++++++-
 properties/kubernetes.properties                    |  2 ++
 .../assemble/datawave/src/main/docker/Dockerfile    |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-accumulo.yml b/.github/workflows/build-accumulo.yml
index 733da4c27bc..0878a1ad3e5 100644
--- a/.github/workflows/build-accumulo.yml
+++ b/.github/workflows/build-accumulo.yml
@@ -79,6 +79,16 @@ jobs:
         export JAVA_HOME=$ACCUMULO_JAVA
         cd $GITHUB_WORKSPACE/accumulo   
         mvn -DaltDeploymentRepository=github-datawave::https://maven.pkg.github.com/NationalSecurityAgency/datawave -V -B -e -ntp "-Dstyle.color=always" -DskipTests -T1C clean deploy -s $GITHUB_WORKSPACE/datawave/.github/workflows/settings.xml
+    - name: Trigger accumulo image build
+      if: ${{ ( github.event.inputs.deployAccumulo || 'false' )  == 'true'}}
+      run: |
+          curl -L \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ secrets.REPOSITORY_ACCESS_TOKEN }}" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/nationalsecurityagency/datawve-stack-docker-images/dispatches \
+            -d '{"event_type":"dispatch-event", client_payload: {"accumuloRepo": "${{ github.event.inputs.accumuloRepo || 'apache/accumulo' }}", "accumuloBranch": "${{ github.event.inputs.accumuloBranch || '2.1' }}", "tag": ${{ steps.get-accumulo-version.outputs.accumuloversion }}}}'
     - name: Log in to the Container registry
       uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
       with:
@@ -92,11 +102,12 @@ jobs:
         export JAVA_HOME=$DATAWAVE_JAVA
         cd $GITHUB_WORKSPACE/datawave
         mvn -s $GITHUB_WORKSPACE/datawave/.github/workflows/settings.xml versions:set-property -Dproperty=version.accumulo -DnewVersion=${{ steps.get-accumulo-version.outputs.accumuloversion }} -DgenerateBackupPoms=false
+ 
     - name: Build Web and Ingest Docker Images (Maven)
       run: |
 
         export JAVA_HOME=$DATAWAVE_JAVA
         cd $GITHUB_WORKSPACE/datawave
-        mvn -s $GITHUB_WORKSPACE/datawave/.github/workflows/settings.xml clean install -Prpm,kubernetes,assemble,deploy-ws -Ddist -Pdocker -DpushImage -Ddocker-release -DskipTests
+        mvn -s $GITHUB_WORKSPACE/datawave/.github/workflows/settings.xml clean install -Prpm,kubernetes,assemble,deploy-ws -Ddist -Pdocker -DpushImage -Ddocker-release -DskipTests -Ddocker.image.accumulo.tag=${{ steps.get-accumulo-version.outputs.accumuloversion }}
 
  
diff --git a/properties/kubernetes.properties b/properties/kubernetes.properties
index ee3ffc36200..7d7dddc3eb8 100644
--- a/properties/kubernetes.properties
+++ b/properties/kubernetes.properties
@@ -3,6 +3,8 @@ RCPT_TO=hadoop@localhost
 
 docker.image.prefix=ghcr.io/nationalsecurityagency/
 
+{docker.image.accumulo.tag=2.1.3
+
 # ingest properties
 DATAWAVE_INGEST_HOME=/opt/datawave-ingest/current
 
diff --git a/warehouse/assemble/datawave/src/main/docker/Dockerfile b/warehouse/assemble/datawave/src/main/docker/Dockerfile
index 6bc6d4827b2..91b5a37b861 100644
--- a/warehouse/assemble/datawave/src/main/docker/Dockerfile
+++ b/warehouse/assemble/datawave/src/main/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ${docker.image.prefix}datawave-stack-accumulo:2.1.3
+FROM ${docker.image.prefix}datawave-stack-accumulo:${docker.image.accumulo.tag}
 USER root
 COPY --from=${docker.image.prefix}datawave-stack-hadoop:3.3.6  /usr/local/hadoop/  /usr/local/hadoop/