Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .github/workflows/build-images.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Build and Push Image

on:
push:
paths-ignore: ['*.md', 'CODEOWNERS', 'LICENSE']
tags:
- "**"
branches:
- 'main'
- 'release/version*'
workflow_dispatch:
jobs:
call-reusable-workflow:
uses: nationalsecurityagency/datawave/.github/workflows/microservice-build-image.yaml@integration
secrets:
USER_NAME: ${{ secrets.USER_NAME }}
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
10 changes: 2 additions & 8 deletions .github/workflows/settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,8 @@
<servers>
<server>
<id>github-datawave</id>
<configuration>
<httpHeaders>
<property>
<name>Authorization</name>
<value>Bearer ${env.GITHUB_TOKEN}</value>
</property>
</httpHeaders>
</configuration>
<username>${env.USER_NAME}</username>
<password>${env.ACCESS_TOKEN}</password>
</server>
</servers>
</settings>
47 changes: 5 additions & 42 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,46 +9,9 @@ on:
pull_request:
paths-ignore: ['*.md', 'CODEOWNERS', 'LICENSE']

env:
JAVA_VERSION: '11'
JAVA_DISTRIBUTION: 'zulu' #This is the default on v1 of the action
MAVEN_OPTS: "-Djansi.force=true -Dhttps.protocols=TLSv1.2 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Djava.awt.headless=true -XX:ThreadStackSize=1m"

jobs:
# Runs the pom sorter and code formatter to ensure that the code
# is formatted and poms are sorted according to project rules. This
# will fail if the formatter makes any changes.
check-code-formatting:
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v4
- name: Set up JDK ${{ env.JAVA_VERSION }}
uses: actions/setup-java@v4
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: ${{ env.JAVA_DISTRIBUTION }}
cache: 'maven'
- name: Format code
run: |
mvn -s $GITHUB_WORKSPACE/.github/workflows/settings.xml -V -B -e clean formatter:format sortpom:sort -Pautoformat
git status
git diff-index --quiet HEAD || (echo "Error! There are modified files after formatting." && false)
env:
GITHUB_TOKEN: ${{ github.token }}
# Build the code and run the unit/integration tests.
build-and-test:
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v4
- name: Set up JDK ${{ env.JAVA_VERSION }}
uses: actions/setup-java@v4
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: ${{ env.JAVA_DISTRIBUTION }}
cache: 'maven'
- name: Build and Run Unit Tests
run: mvn -s $GITHUB_WORKSPACE/.github/workflows/settings.xml -V -B -e -Ddist clean verify
env:
GITHUB_TOKEN: ${{ github.token }}
call-reusable-workflow:
uses: nationalsecurityagency/datawave/.github/workflows/microservice-maven-tests.yaml@integration
secrets:
USER_NAME: ${{ secrets.USER_NAME }}
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ chart/Chart.lock
chart/charts/*.tgz
chart/Chart.lock
target/
**/target`
**/target
30 changes: 10 additions & 20 deletions bundler/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,38 +57,28 @@
<profiles>
<profile>
<id>docker</id>
<activation>
<property>
<name>microservice-docker</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<imageName>${docker.registry}nationalsecurityagency/datawave-bundler-service:${project.version}</imageName>
</configuration>
<executions>
<execution>
<id>build-image</id>
<goals>
<goal>build</goal>
</goals>
<phase>package</phase>
</execution>
<execution>
<id>tag-image</id>
<goals>
<goal>tag</goal>
</goals>
<phase>install</phase>
<configuration>
<image>datawave/${project.artifactId}:${project.version}</image>
<newName>${docker.registry}datawave/${project.artifactId}:${project.version}</newName>
</configuration>
</execution>
<execution>
<id>push-image</id>
<goals>
<goal>push</goal>
</goals>
<phase>deploy</phase>
<phase>install</phase>
<configuration>
<imageName>${docker.registry}datawave/${project.artifactId}:${project.version}</imageName>
<imageName>${docker.registry}nationalsecurityagency/datawave-bundler-service:${project.version}</imageName>
</configuration>
</execution>
</executions>
Expand Down
30 changes: 10 additions & 20 deletions feeder/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,38 +53,28 @@
<profiles>
<profile>
<id>docker</id>
<activation>
<property>
<name>microservice-docker</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<imageName>${docker.registry}nationalsecurityagency/datawave-feeder-service:${project.version}</imageName>
</configuration>
<executions>
<execution>
<id>build-image</id>
<goals>
<goal>build</goal>
</goals>
<phase>package</phase>
</execution>
<execution>
<id>tag-image</id>
<goals>
<goal>tag</goal>
</goals>
<phase>install</phase>
<configuration>
<image>datawave/${project.artifactId}:${project.version}</image>
<newName>${docker.registry}datawave/${project.artifactId}:${project.version}</newName>
</configuration>
</execution>
<execution>
<id>push-image</id>
<goals>
<goal>push</goal>
</goals>
<phase>deploy</phase>
<phase>install</phase>
<configuration>
<imageName>${docker.registry}datawave/${project.artifactId}:${project.version}</imageName>
<imageName>${docker.registry}nationalsecurityagency/datawave-feeder-service:${project.version}</imageName>
</configuration>
</execution>
</executions>
Expand Down
2 changes: 1 addition & 1 deletion feeder/src/main/chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ feeds: []
workingDir: /

image:
repository: "datawave/feeder-service"
repository: "nationalsecurityagency/datawave-bundler-service"
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: ""
Expand Down
30 changes: 10 additions & 20 deletions ingest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,38 +61,28 @@
<profiles>
<profile>
<id>docker</id>
<activation>
<property>
<name>microservice-docker</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<imageName>${docker.registry}nationalsecurityagency/datawave-ingest-service:${project.version}</imageName>
</configuration>
<executions>
<execution>
<id>build-image</id>
<goals>
<goal>build</goal>
</goals>
<phase>package</phase>
</execution>
<execution>
<id>tag-image</id>
<goals>
<goal>tag</goal>
</goals>
<phase>install</phase>
<configuration>
<image>datawave/${project.artifactId}:${project.version}</image>
<newName>${docker.registry}datawave/${project.artifactId}:${project.version}</newName>
</configuration>
</execution>
<execution>
<id>push-image</id>
<goals>
<goal>push</goal>
</goals>
<phase>deploy</phase>
<phase>install</phase>
<configuration>
<imageName>${docker.registry}datawave/${project.artifactId}:${project.version}</imageName>
<imageName>${docker.registry}nationalsecurityagency/datawave-ingest-service:${project.version}</imageName>
</configuration>
</execution>
</executions>
Expand Down
2 changes: 1 addition & 1 deletion ingest/src/main/chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ pools: []
# truststore: ""

image:
repository: "datawave/ingest-service"
repository: "nationalsecurityagency/datawave-ingest-service"
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: ""
Expand Down