packaging: Added workflow directory to each step on #2163

h2oai · Nov 17, 2023 · 51a91b6 · 51a91b6
1 parent acad043
commit 51a91b6
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 17 deletions.
diff --git a/.github/workflows/helm-release.yaml b/.github/workflows/helm-release.yaml
@@ -27,3 +27,4 @@ jobs:
     with:
       build-version: ${{ needs.retrieve-metadata.outputs.build-version }}
       helm-chart-artifact: wave-bundle-helm
+      wave-app-name: university
diff --git a/.github/workflows/wave-bundle-docker-build-publish.yaml b/.github/workflows/wave-bundle-docker-build-publish.yaml
@@ -15,6 +15,10 @@ on:
         type: string
         description: Path to the working directory, where docker build will be executed
         default: .
+      wave-app-name:
+        type: string
+        description: The name of the wave app
+        required: true
 
 jobs:
   docker:
@@ -55,25 +59,25 @@ jobs:
         # Tries to describe the repository and if it fails, creates it
         run: |
           aws ecr describe-repositories \
-            --repository-names h2oai/${{ github.event.repository.name }}-bundle 2>/dev/null ||
+            --repository-names h2oai/${{ inputs.wave-app-name }}-bundle 2>/dev/null ||
           aws ecr create-repository \
-            --repository-name h2oai/${{ github.event.repository.name }}-bundle \
+            --repository-name h2oai/${{ inputs.wave-app-name }}-bundle \
             --image-tag-mutability IMMUTABLE \
             --tag \
-              Key=GithubRepo,Value=github.com/h2oai/${{ github.event.repository.name }} \
+              Key=GithubRepo,Value=github.com/h2oai/${{ inputs.wave-app-name }} \
               Key=ManagedBy,Value=GitHubActions \
               Key=CreatedByWorkflow,Value=${{ github.workflow_ref }}
 
       - name: "Ensure ECR Repository for the runtime"
         # Tries to describe the repository and if it fails, creates it
         run: |
           aws ecr describe-repositories \
-            --repository-names h2oai/${{ github.event.repository.name }} 2>/dev/null ||
+            --repository-names h2oai/${{ inputs.wave-app-name }} 2>/dev/null ||
           aws ecr create-repository \
-            --repository-name h2oai/${{ github.event.repository.name }} \
+            --repository-name h2oai/${{ inputs.wave-app-name }} \
             --image-tag-mutability IMMUTABLE \
             --tag \
-              Key=GithubRepo,Value=github.com/h2oai/${{ github.event.repository.name }} \
+              Key=GithubRepo,Value=github.com/h2oai/${{ inputs.wave-app-name }} \
               Key=ManagedBy,Value=GitHubActions \
               Key=CreatedByWorkflow,Value=${{ github.workflow_ref }}
 
@@ -87,7 +91,7 @@ jobs:
           platforms: linux/amd64
           provenance: false
           tags: |
-            524466471676.dkr.ecr.us-east-1.amazonaws.com/h2oai/${{ github.event.repository.name }}-bundle:${{ inputs.build-version }}
+            524466471676.dkr.ecr.us-east-1.amazonaws.com/h2oai/${{ inputs.wave-app-name }}-bundle:${{ inputs.build-version }}
 
       - name: Build and Export Runtime Image
         uses: docker/build-push-action@v4
@@ -99,12 +103,12 @@ jobs:
           platforms: linux/amd64
           provenance: false
           tags: |
-            524466471676.dkr.ecr.us-east-1.amazonaws.com/h2oai/${{ github.event.repository.name }}:${{ inputs.build-version }}
+            524466471676.dkr.ecr.us-east-1.amazonaws.com/h2oai/${{ inputs.wave-app-name }}:${{ inputs.build-version }}
 
       - name: Published Images Summary
         run: |
           echo "#### Image Tags" >> $GITHUB_STEP_SUMMARY
           echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
-          echo "docker image push 524466471676.dkr.ecr.us-east-1.amazonaws.com/h2oai/${{ github.event.repository.name }}-bundle:${{ inputs.build-version }}" >> $GITHUB_STEP_SUMMARY
-          echo "docker image push 524466471676.dkr.ecr.us-east-1.amazonaws.com/h2oai/${{ github.event.repository.name }}:${{ inputs.build-version }}" >> $GITHUB_STEP_SUMMARY
+          echo "docker image push 524466471676.dkr.ecr.us-east-1.amazonaws.com/h2oai/${{ inputs.wave-app-name }}-bundle:${{ inputs.build-version }}" >> $GITHUB_STEP_SUMMARY
+          echo "docker image push 524466471676.dkr.ecr.us-east-1.amazonaws.com/h2oai/${{ inputs.wave-app-name }}:${{ inputs.build-version }}" >> $GITHUB_STEP_SUMMARY
           echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
diff --git a/.github/workflows/wave-bundle-helm-release.yaml b/.github/workflows/wave-bundle-helm-release.yaml
@@ -15,6 +15,10 @@ on:
         type: string
         description: The name of the artifact containing the generated Helm chart
         required: true
+      wave-app-name:
+        type: string
+        description: The name of the wave app
+        required: true
 
 jobs:
   helm:
@@ -45,12 +49,12 @@ jobs:
         # Tires to describe the repository and if it fails, creates it
         run: |
           aws ecr describe-repositories \
-            --repository-names charts/${{ github.event.repository.name }} 2>/dev/null ||
+            --repository-names charts/${{ inputs.wave-app-name }} 2>/dev/null ||
           aws ecr create-repository \
-            --repository-name charts/${{ github.event.repository.name }} \
+            --repository-name charts/${{ inputs.wave-app-name }} \
             --image-tag-mutability IMMUTABLE \
             --tag \
-              Key=GithubRepo,Value=github.com/h2oai/${{ github.event.repository.name }} \
+              Key=GithubRepo,Value=github.com/h2oai/${{ inputs.wave-app-name }} \
               Key=ManagedBy,Value=GitHubActions \
               Key=CreatedByWorkflow,Value=${{ github.workflow_ref }}
 

diff --git a/.github/workflows/wave-bundle.yaml b/.github/workflows/wave-bundle.yaml
@@ -20,7 +20,7 @@ jobs:
 
       - name: Download H2O CLI
         working-directory: ./university
-        run: mkdir -p .bin && curl -o .bin/h2o https://h2oai-cloud-release.s3.amazonaws.com/releases/ai/h2o/h2o-cloud/v0.28.2/cli/linux-amd64/h2o
+        run: mkdir -p .bin && curl -o .bin/h2o https://h2oai-cloud-release.s3.amazonaws.com/releases/ai/h2o/h2o-cloud/latest/cli/linux-amd64/h2o
 
       - name: Change permissions
         working-directory: ./university
@@ -40,13 +40,12 @@ jobs:
         run: |
           .bin/h2o bundle \
             --docker-base-image 524466471676.dkr.ecr.us-east-1.amazonaws.com/q8s/launcher:v0.23.0-38 \
-            --docker-include static \
             --docker-use-buildkit \
             --generate-helm-charts \
             --helm-chart-version 0.0.1 \
             --helm-chart-name university \
-            --helm-app-bundle-image-repo 524466471676.dkr.ecr.us-east-1.amazonaws.com/h2oai/${{ github.event.repository.name }}-bundle \
-            --helm-app-runtime-image-repo 524466471676.dkr.ecr.us-east-1.amazonaws.com/h2oai/${{ github.event.repository.name }} \
+            --helm-app-bundle-image-repo 524466471676.dkr.ecr.us-east-1.amazonaws.com/h2oai/university-bundle \
+            --helm-app-runtime-image-repo 524466471676.dkr.ecr.us-east-1.amazonaws.com/h2oai/university \
             --generate-dockerfile
 
       - uses: actions/upload-artifact@v3

diff --git a/.github/workflows/wave-publish.yaml b/.github/workflows/wave-publish.yaml
@@ -27,3 +27,4 @@ jobs:
     with:
       build-version: ${{ needs.retrieve-metadata.outputs.build-version }}
       bundle-artifact: wave-bundle
+      wave-app-name: university