Switch to guild-deploy for workflows (WIP)

cardano-community · Nov 29, 2022 · 3085aab · 3085aab
1 parent 5f424fe
commit 3085aab
Show file tree

Hide file tree

Showing 22 changed files with 81 additions and 230 deletions.
diff --git a/.github/disabled-workflows/premerge_amazonlinux2.yml b/.github/disabled-workflows/premerge_amazonlinux2.yml
@@ -8,7 +8,7 @@ on:
       - scripts/cnode-helper-scripts/cabal-build-all.sh
       - files/cabal.project.local
       - files/tests/amazonlinux2_prereqs.sh.containerfile
-      - files/tests/amazonlinux2_prereqs.sh_-l.containerfile
+      - files/tests/amazonlinux2_prereqs.sh-l.containerfile
 
 jobs:
   prerequisites:
@@ -117,11 +117,11 @@ jobs:
         export BRANCH=${{ steps.pr_branch.outputs.branch }}
         export G_ACCOUNT=${{ steps.pr_branch.outputs.owner }}
         export COMMIT=$(git rev-parse --short "$GITHUB_SHA")
-        docker build . --file files/tests/pre-merge/amazonlinux2_prereqs.sh_-l.containerfile --compress --build-arg BRANCH --build-arg COMMIT --build-arg G_ACCOUNT --tag ghcr.io/cardano-community/pre-merge-amazonlinux2:prereqs_-l_${COMMIT}
-    - name: Push pre-merge-amazonlinux2:prereqs_-l_${COMMIT}
+        docker build . --file files/tests/pre-merge/amazonlinux2_prereqs.sh-l.containerfile --compress --build-arg BRANCH --build-arg COMMIT --build-arg G_ACCOUNT --tag ghcr.io/cardano-community/pre-merge-amazonlinux2:prereqs-l_${COMMIT}
+    - name: Push pre-merge-amazonlinux2:prereqs-l_${COMMIT}
       run: |
         export COMMIT=$(git rev-parse --short "$GITHUB_SHA")
-        docker push ghcr.io/cardano-community/pre-merge-amazonlinux2:prereqs_-l_${COMMIT}
+        docker push ghcr.io/cardano-community/pre-merge-amazonlinux2:prereqs-l_${COMMIT}
 
   build-with-system-libsodium:
     needs: prerequisites-with-system-libsodium
@@ -155,4 +155,4 @@ jobs:
         export BRANCH=${{ steps.pr_branch.outputs.branch }}
         export COMMIT=$(git rev-parse --short "$GITHUB_SHA")
         echo "Working from PR Branch ${BRANCH} on Commit ${COMMIT}"
-        docker build . --file files/tests/pre-merge/amazonlinux2-cabal_-l.containerfile --compress --build-arg BRANCH --build-arg COMMIT --tag ghcr.io/cardano-community/pre-merge-amazonlinux2:cabal_-l_${COMMIT}
+        docker build . --file files/tests/pre-merge/amazonlinux2-cabal-l.containerfile --compress --build-arg BRANCH --build-arg COMMIT --tag ghcr.io/cardano-community/pre-merge-amazonlinux2:cabal-l_${COMMIT}
diff --git a/.github/disabled-workflows/premerge_debian.yml b/.github/disabled-workflows/premerge_debian.yml
@@ -8,7 +8,7 @@ on:
       - scripts/cnode-helper-scripts/cabal-build-all.sh
       - files/cabal.project.local
       - files/tests/pre-merge/debian_prereqs.sh.containerfile
-      - files/tests/pre-merge/debian_prereqs.sh_-l.containerfile
+      - files/tests/pre-merge/debian_prereqs.sh-l.containerfile
 
 jobs:
   prerequisites:
@@ -116,11 +116,11 @@ jobs:
         export BRANCH=${{ steps.pr_branch.outputs.branch }}
         export G_ACCOUNT=${{ steps.pr_branch.outputs.owner }}
         export COMMIT=$(git rev-parse --short "$GITHUB_SHA")
-        docker build . --file files/tests/pre-merge/debian_prereqs.sh_-l.containerfile --compress --build-arg BRANCH --build-arg COMMIT --build-arg G_ACCOUNT --tag ghcr.io/cardano-community/pre-merge-debian:prereqs_-l_${COMMIT}
-    - name: Push pre-merge-debian:prereqs_-l_${COMMIT}
+        docker build . --file files/tests/pre-merge/debian_prereqs.sh-l.containerfile --compress --build-arg BRANCH --build-arg COMMIT --build-arg G_ACCOUNT --tag ghcr.io/cardano-community/pre-merge-debian:prereqs-l_${COMMIT}
+    - name: Push pre-merge-debian:prereqs-l_${COMMIT}
       run: |
         export COMMIT=$(git rev-parse --short "$GITHUB_SHA")
-        docker push ghcr.io/cardano-community/pre-merge-debian:prereqs_-l_${COMMIT}
+        docker push ghcr.io/cardano-community/pre-merge-debian:prereqs-l_${COMMIT}
 
   build-with-system-libsodium:
     needs: prerequisites-with-system-libsodium
@@ -155,4 +155,4 @@ jobs:
         export BRANCH=${{ steps.pr_branch.outputs.branch }}
         export COMMIT=$(git rev-parse --short "$GITHUB_SHA")
         echo "Working from PR Branch ${BRANCH} on Commit ${COMMIT}"
-        docker build . --file files/tests/pre-merge/debian-cabal_-l.containerfile --compress --build-arg BRANCH --build-arg COMMIT --tag ghcr.io/cardano-community/pre-merge-debian:cabal_-l_${COMMIT}
+        docker build . --file files/tests/pre-merge/debian-cabal-l.containerfile --compress --build-arg BRANCH --build-arg COMMIT --tag ghcr.io/cardano-community/pre-merge-debian:cabal-l_${COMMIT}
diff --git a/.github/disabled-workflows/premerge_rockylinux8.yml b/.github/disabled-workflows/premerge_rockylinux8.yml
@@ -8,7 +8,7 @@ on:
       - scripts/cnode-helper-scripts/cabal-build-all.sh
       - files/cabal.project.local
       - files/tests/rockylinux8_prereqs.sh.containerfile
-      - files/tests/rockylinux8_prereqs.sh_-l.containerfile
+      - files/tests/rockylinux8_prereqs.sh-l.containerfile
 
 jobs:
   prerequisites:
@@ -116,7 +116,7 @@ jobs:
         export BRANCH=${{ steps.pr_branch.outputs.branch }}
         export COMMIT=$(git rev-parse --short "$GITHUB_SHA")
         echo "Working from PR Branch ${BRANCH} on Commit ${COMMIT}"
-        docker build . --file files/tests/pre-merge/rockylinux8-cabal_-l.containerfile --compress --build-arg BRANCH --build-arg COMMIT --tag ghcr.io/cardano-community/pre-merge-rockylinux8:cabal_-l_${COMMIT}
+        docker build . --file files/tests/pre-merge/rockylinux8-cabal-l.containerfile --compress --build-arg BRANCH --build-arg COMMIT --tag ghcr.io/cardano-community/pre-merge-rockylinux8:cabal-l_${COMMIT}
 
   prerequisites-with-system-libsodium:
     runs-on: ubuntu-latest
@@ -151,8 +151,8 @@ jobs:
         export BRANCH=${{ steps.pr_branch.outputs.branch }}
         export G_ACCOUNT=${{ steps.pr_branch.outputs.owner }}
         export COMMIT=$(git rev-parse --short "$GITHUB_SHA")
-        docker build . --file files/tests/pre-merge/rockylinux8_prereqs.sh_-l.containerfile --compress --build-arg BRANCH --build-arg COMMIT --build-arg G_ACCOUNT --tag ghcr.io/cardano-community/pre-merge-rockylinux8:prereqs_-l_${COMMIT}
-    - name: Push pre-merge-rockylinux8:prereqs_-l_${COMMIT}
+        docker build . --file files/tests/pre-merge/rockylinux8_prereqs.sh-l.containerfile --compress --build-arg BRANCH --build-arg COMMIT --build-arg G_ACCOUNT --tag ghcr.io/cardano-community/pre-merge-rockylinux8:prereqs-l_${COMMIT}
+    - name: Push pre-merge-rockylinux8:prereqs-l_${COMMIT}
       run: |
         export COMMIT=$(git rev-parse --short "$GITHUB_SHA")
-        docker push ghcr.io/cardano-community/pre-merge-rockylinux8:prereqs_-l_${COMMIT}
+        docker push ghcr.io/cardano-community/pre-merge-rockylinux8:prereqs-l_${COMMIT}
diff --git a/.github/disabled-workflows/premerge_ubuntu.yml b/.github/disabled-workflows/premerge_ubuntu.yml
diff --git a/.github/workflows/premerge_ubuntu.yml b/.github/workflows/premerge_ubuntu.yml
@@ -7,7 +7,7 @@ on:
       - scripts/cnode-helper-scripts/guild-deploy.sh
       - scripts/cnode-helper-scripts/cabal-build-all.sh
       - files/cabal.project.local
-      - files/tests/ubuntu_guild-deploy.sh.containerfile
+      - files/tests/ubuntu-guild-deploy.sh.containerfile
 
 jobs:
   #prerequisites:
@@ -43,7 +43,7 @@ jobs:
   #      export BRANCH=${{ steps.pr_branch.outputs.branch }}
   #      export G_ACCOUNT=${{ steps.pr_branch.outputs.owner }}
   #      export COMMIT=$(git rev-parse --short "$GITHUB_SHA")
-  #      docker build . --file files/tests/pre-merge/ubuntu_guild-deploy.sh.containerfile --compress --build-arg BRANCH --build-arg COMMIT --build-arg G_ACCOUNT --tag ghcr.io/cardano-community/pre-merge-ubuntu:guild-deploy_${COMMIT}
+  #      docker build . --file files/tests/pre-merge/ubuntu-guild-deploy.sh.containerfile --compress --build-arg BRANCH --build-arg COMMIT --build-arg G_ACCOUNT --tag ghcr.io/cardano-community/pre-merge-ubuntu:guild-deploy_${COMMIT}
   #  - name: Push pre-merge-ubuntu:guild-deploy_${COMMIT}
   #    run: |
   #      export COMMIT=$(git rev-parse --short "$GITHUB_SHA")
@@ -83,7 +83,7 @@ jobs:
   #      echo "Working from PR Branch ${BRANCH} on Commit ${COMMIT}"
   #      docker build . --file files/tests/pre-merge/ubuntu-cabal.containerfile --compress --build-arg BRANCH --build-arg COMMIT --tag ghcr.io/cardano-community/pre-merge-ubuntu:cabal_${COMMIT}
 
-  prerequisites-with-system-libsodium:
+  with-system-libsodium:
     runs-on: ubuntu-latest
     steps:
     - name: Provide additional free space
@@ -95,7 +95,9 @@ jobs:
         sudo apt-get remove -y azure-cli google-cloud-sdk google-chrome-stable firefox powershell mono-devel
         sudo apt-get autoremove -y
         sudo apt-get clean
-        sudo rm -rf /usr/share/dotnet
+        sudo rm -rf "/usr/share/dotnet"
+        sudo rm -rf "/usr/local/lib/android"
+        sudo rm -rf "/opt/ghc"
         sudo rm -rf "/usr/local/share/boost"
         sudo rm -rf "$AGENT_TOOLSDIRECTORY"
     - name: Login to GitHub Container Registry
@@ -111,20 +113,33 @@ jobs:
         echo "##[set-output name=branch;]${GITHUB_HEAD_REF}"
         echo "##[set-output name=owner;]${GITHUB_REPOSITORY_OWNER}"
       id: pr_branch
-    - name: Testing guild-deploy.sh
+    - name: Testing guild-deploy.sh (system libsodium)
       run: |
         export BRANCH=${{ steps.pr_branch.outputs.branch }}
         export G_ACCOUNT=${{ steps.pr_branch.outputs.owner }}
         export COMMIT=$(git rev-parse --short "$GITHUB_SHA")
-        docker build . --file files/tests/pre-merge/ubuntu_guild-deploy.sh.containerfile --compress --build-arg BRANCH --build-arg COMMIT --build-arg G_ACCOUNT --tag ghcr.io/cardano-community/pre-merge-ubuntu:guild-deploy_${COMMIT}
+        docker build . --file files/tests/pre-merge/ubuntu-guild-deploy.sh.containerfile --compress --build-arg BRANCH --build-arg COMMIT --build-arg G_ACCOUNT --tag ghcr.io/cardano-community/pre-merge-ubuntu:guild-deploy_${COMMIT}
     - name: Push pre-merge-ubuntu:guild-deploy_${COMMIT}
       run: |
         export COMMIT=$(git rev-parse --short "$GITHUB_SHA")
         docker push ghcr.io/cardano-community/pre-merge-ubuntu:guild-deploy_${COMMIT}
-    - name: Testing cabal-build-all.sh -l
+    - name: Testing cabal-build-all.sh (system libsodium)
       run: |
         export BRANCH=${{ steps.pr_branch.outputs.branch }}
         export G_ACCOUNT=${{ steps.pr_branch.outputs.owner }}
         export COMMIT=$(git rev-parse --short "$GITHUB_SHA")
         echo "Working from PR Branch ${G_ACCOUNT}/guild-operators/${BRANCH} on Commit ${COMMIT}"
-        docker build . --file files/tests/pre-merge/ubuntu-cabal_-l.containerfile --compress --build-arg BRANCH --build-arg COMMIT --tag ghcr.io/cardano-community/pre-merge-ubuntu:cabal_-l_${COMMIT}
+        docker build . --file files/tests/pre-merge/ubuntu-cabal.containerfile --compress --build-arg BRANCH --build-arg COMMIT --tag ghcr.io/cardano-community/pre-merge-ubuntu:cabal_${COMMIT}
+    - name: Testing guild-deploy.sh (IO fork of libsodium)
+      run: |
+        export BRANCH=${{ steps.pr_branch.outputs.branch }}
+        export G_ACCOUNT=${{ steps.pr_branch.outputs.owner }}
+        export COMMIT=$(git rev-parse --short "$GITHUB_SHA")
+        docker build . --file files/tests/pre-merge/ubuntu-guild-deploy-l.sh.containerfile --compress --build-arg BRANCH --build-arg COMMIT --build-arg G_ACCOUNT --tag ghcr.io/cardano-community/pre-merge-ubuntu:guild-deploy-l_${COMMIT}
+    - name: Testing cabal-build-all.sh (IO fork of libsodium)
+      run: |
+        export BRANCH=${{ steps.pr_branch.outputs.branch }}
+        export G_ACCOUNT=${{ steps.pr_branch.outputs.owner }}
+        export COMMIT=$(git rev-parse --short "$GITHUB_SHA")
+        echo "Working from PR Branch ${G_ACCOUNT}/guild-operators/${BRANCH} on Commit ${COMMIT}"
+        docker build . --file files/tests/pre-merge/ubuntu-cabal-l.containerfile --compress --build-arg BRANCH --build-arg COMMIT --tag ghcr.io/cardano-community/pre-merge-ubuntu:cabal-l_${COMMIT}
diff --git a/docs/docker/docker.md b/docs/docker/docker.md
@@ -15,7 +15,6 @@ Running your own Cardano node has never been so fast and easy.
 - cardano-cli
 - cardano-hw-cli
 - cardano-node
-- cardano-ping
 - cardano-submit-api
 
 ### 🔔 Built-in tools

diff --git a/...merge/amazonlinux2-cabal_-l.containerfile → ...-merge/amazonlinux2-cabal-l.containerfile b/...merge/amazonlinux2-cabal_-l.containerfile → ...-merge/amazonlinux2-cabal-l.containerfile
@@ -1,5 +1,5 @@
 ARG COMMIT
-FROM ghcr.io/cardano-community/pre-merge-amazonlinux2:prereqs_-l_${COMMIT}
+FROM ghcr.io/cardano-community/pre-merge-amazonlinux2:guild-deploy-l_${COMMIT}
 ARG BRANCH
 ARG CNODE_HOME=/opt/cardano/cnode
 
@@ -21,5 +21,4 @@ RUN curl -o cardano-node-latest.txt "https://raw.githubusercontent.com/cardano-c
     git checkout tags/"${CNODE_VERSION}" &&\
     git status &&\
     /opt/cardano/cnode/scripts/cabal-build-all.sh -l &&\
-    cabal install cardano-ping &&\
     /root/.cabal/bin/cardano-cli version ; /root/.cabal/bin/cardano-node version
diff --git a/files/tests/pre-merge/amazonlinux2-cabal.containerfile b/files/tests/pre-merge/amazonlinux2-cabal.containerfile
@@ -1,5 +1,5 @@
 ARG COMMIT
-FROM ghcr.io/cardano-community/pre-merge-amazonlinux2:prereqs_${COMMIT}
+FROM ghcr.io/cardano-community/pre-merge-amazonlinux2:guild-deploy_${COMMIT}
 ARG BRANCH
 ARG CNODE_HOME=/opt/cardano/cnode
 
@@ -21,5 +21,4 @@ RUN curl -o cardano-node-latest.txt "https://raw.githubusercontent.com/cardano-c
     git checkout tags/"${CNODE_VERSION}" &&\
     git status &&\
     /opt/cardano/cnode/scripts/cabal-build-all.sh &&\
-    cabal install cardano-ping &&\
     /root/.cabal/bin/cardano-cli version ; /root/.cabal/bin/cardano-node version
diff --git a/.../amazonlinux2_prereqs.sh_-l.containerfile → ...zonlinux2-guild-deploy.sh-l.containerfile b/.../amazonlinux2_prereqs.sh_-l.containerfile → ...zonlinux2-guild-deploy.sh-l.containerfile
@@ -16,9 +16,9 @@ WORKDIR /
 RUN echo "Working on branch ${BRANCH} and commit ${COMMIT}" &&\
     amazon-linux-extras install epel -y && yum -y install git && yum clean all &&\
     mkdir -pv /root/.cabal/bin /root/.ghcup/bin &&\
-    curl -sS -o prereqs.sh "https://raw.githubusercontent.com/${G_ACCOUNT}/guild-operators/${BRANCH}/scripts/cnode-helper-scripts/prereqs.sh" &&\
-    chmod 755 prereqs.sh &&\
+    curl -sS -o guild-deploy.sh "https://raw.githubusercontent.com/${G_ACCOUNT}/guild-operators/${BRANCH}/scripts/cnode-helper-scripts/guild-deploy.sh" &&\
+    chmod 755 guild-deploy.sh &&\
     export SUDO='N' &&\
     export UPDATE_CHECK='N' &&\
     export G_ACCOUNT="${G_ACCOUNT}" &&\
-    ./prereqs.sh -l -b "${BRANCH}"
+    ./guild-deploy.sh -l -b "${BRANCH}"