Merge pull request #1046 from OpenLiberty/staging

Merge staging to prod - remove docker build
OpenLiberty · Apr 23, 2024 · 7aadb8a · 7aadb8a
2 parents 1de07fd + f9ab4a8
commit 7aadb8a
Show file tree

Hide file tree

Showing 4 changed files with 107 additions and 107 deletions.
diff --git a/.github/workflows/daily-build-java17.yml b/.github/workflows/daily-build-java17.yml
@@ -23,8 +23,8 @@ on:
         required: false
 
 env:
-  DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-  DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+  #DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+  #DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
   CHANGE_MINIKUBE_NONE_USER: true
 
 jobs:
@@ -77,33 +77,33 @@ jobs:
           path: ${{ matrix.repos }}
       - name: Set permissions
         run: chmod +x ${{ matrix.repos }}/scripts/*.sh
-      - name: Docker login for runner
-        run: |
-          if [ "${{ matrix.repos }}" = "guide-liberty-deep-dive-gradle" ]
-          then
-            echo podman login
-            echo $DOCKER_PASSWORD | podman login docker.io -u $DOCKER_USERNAME --password-stdin
-          else
-            echo docker login
-            echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin
-          fi
-      - name: Docker login for root
-        run: |
-          if [ "${{ matrix.repos }}" = "guide-liberty-deep-dive-gradle" ]
-          then
-            echo podman login
-            echo $DOCKER_PASSWORD | sudo podman login docker.io -u $DOCKER_USERNAME --password-stdin
-          else
-            echo docker login
-            echo $DOCKER_PASSWORD | sudo docker login -u $DOCKER_USERNAME --password-stdin
-          fi
+      #- name: Docker login for runner
+      #  run: |
+      #    if [ "${{ matrix.repos }}" = "guide-liberty-deep-dive-gradle" ]
+      #    then
+      #      echo podman login
+      #      echo $DOCKER_PASSWORD | podman login docker.io -u $DOCKER_USERNAME --password-stdin
+      #    else
+      #      echo docker login
+      #      echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin
+      #    fi
+      #- name: Docker login for root
+      #  run: |
+      #    if [ "${{ matrix.repos }}" = "guide-liberty-deep-dive-gradle" ]
+      #    then
+      #      echo podman login
+      #      echo $DOCKER_PASSWORD | sudo podman login docker.io -u $DOCKER_USERNAME --password-stdin
+      #    else
+      #      echo docker login
+      #      echo $DOCKER_PASSWORD | sudo docker login -u $DOCKER_USERNAME --password-stdin
+      #    fi
       - name: Run tests for ${{ matrix.repos }}
         working-directory: ${{ matrix.repos }}/finish
         env:
           BUILDLEVEL: ${{ github.event.client_payload.build-level }}${{ github.event.inputs.build }}
           DEVDATE: ${{ github.event.client_payload.dev-date }}${{ github.event.inputs.date }}
           DRIVER: ${{ github.event.client_payload.driver-location }}${{ github.event.inputs.driver }}
-        run: sudo -E ../scripts/dailyBuild.sh -t $DEVDATE -d $DRIVER -b $BUILDLEVEL -u $DOCKER_USERNAME -j ${{ matrix.jdk }}
+        run: sudo -E ../scripts/dailyBuild.sh -t $DEVDATE -d $DRIVER -b $BUILDLEVEL -j ${{ matrix.jdk }}
       - name: Post tests
         working-directory: ${{ matrix.repos }}
         if: always()

diff --git a/.github/workflows/daily-build-java21.yml b/.github/workflows/daily-build-java21.yml
@@ -23,8 +23,8 @@ on:
         required: false
 
 env:
-  DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-  DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+  #DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+  #DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
   CHANGE_MINIKUBE_NONE_USER: true
 
 jobs:
@@ -77,33 +77,33 @@ jobs:
           path: ${{ matrix.repos }}
       - name: Set permissions
         run: chmod +x ${{ matrix.repos }}/scripts/*.sh
-      - name: Docker login for runner
-        run: |
-          if [ "${{ matrix.repos }}" = "guide-liberty-deep-dive-gradle" ]
-          then
-            echo podman login
-            echo $DOCKER_PASSWORD | podman login docker.io -u $DOCKER_USERNAME --password-stdin
-          else
-            echo docker login
-            echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin
-          fi
-      - name: Docker login for root
-        run: |
-          if [ "${{ matrix.repos }}" = "guide-liberty-deep-dive-gradle" ]
-          then
-            echo podman login
-            echo $DOCKER_PASSWORD | sudo podman login docker.io -u $DOCKER_USERNAME --password-stdin
-          else
-            echo docker login
-            echo $DOCKER_PASSWORD | sudo docker login -u $DOCKER_USERNAME --password-stdin
-          fi
+      #- name: Docker login for runner
+      #  run: |
+      #    if [ "${{ matrix.repos }}" = "guide-liberty-deep-dive-gradle" ]
+      #    then
+      #      echo podman login
+      #      echo $DOCKER_PASSWORD | podman login docker.io -u $DOCKER_USERNAME --password-stdin
+      #    else
+      #      echo docker login
+      #      echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin
+      #    fi
+      #- name: Docker login for root
+      #  run: |
+      #    if [ "${{ matrix.repos }}" = "guide-liberty-deep-dive-gradle" ]
+      #    then
+      #      echo podman login
+      #      echo $DOCKER_PASSWORD | sudo podman login docker.io -u $DOCKER_USERNAME --password-stdin
+      #    else
+      #      echo docker login
+      #      echo $DOCKER_PASSWORD | sudo docker login -u $DOCKER_USERNAME --password-stdin
+      #    fi
       - name: Run tests for ${{ matrix.repos }}
         working-directory: ${{ matrix.repos }}/finish
         env:
           BUILDLEVEL: ${{ github.event.client_payload.build-level }}${{ github.event.inputs.build }}
           DEVDATE: ${{ github.event.client_payload.dev-date }}${{ github.event.inputs.date }}
           DRIVER: ${{ github.event.client_payload.driver-location }}${{ github.event.inputs.driver }}
-        run: sudo -E ../scripts/dailyBuild.sh -t $DEVDATE -d $DRIVER -b $BUILDLEVEL -u $DOCKER_USERNAME -j ${{ matrix.jdk }}
+        run: sudo -E ../scripts/dailyBuild.sh -t $DEVDATE -d $DRIVER -b $BUILDLEVEL -j ${{ matrix.jdk }}
       - name: Post tests
         working-directory: ${{ matrix.repos }}
         if: always()

diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml
@@ -27,8 +27,8 @@ on:
         required: true
 
 env:
-  DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-  DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+  # DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+  # DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
   CHANGE_MINIKUBE_NONE_USER: true
 
 jobs:
@@ -81,33 +81,33 @@ jobs:
           path: ${{ matrix.repos }}
       - name: Set permissions
         run: chmod +x ${{ matrix.repos }}/scripts/*.sh
-      - name: Docker login for runner
-        run: |
-          if [ "${{ matrix.repos }}" = "guide-liberty-deep-dive-gradle" ]
-          then
-            echo podman login
-            echo $DOCKER_PASSWORD | podman login docker.io -u $DOCKER_USERNAME --password-stdin
-          else
-            echo docker login
-            echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin
-          fi
-      - name: Docker login for root
-        run: |
-          if [ "${{ matrix.repos }}" = "guide-liberty-deep-dive-gradle" ]
-          then
-            echo podman login
-            echo $DOCKER_PASSWORD | sudo podman login docker.io -u $DOCKER_USERNAME --password-stdin
-          else
-            echo docker login
-            echo $DOCKER_PASSWORD | sudo docker login -u $DOCKER_USERNAME --password-stdin
-          fi
+      #- name: Docker login for runner
+      #  run: |
+      #    if [ "${{ matrix.repos }}" = "guide-liberty-deep-dive-gradle" ]
+      #    then
+      #      echo podman login
+      #      echo $DOCKER_PASSWORD | podman login docker.io -u $DOCKER_USERNAME --password-stdin
+      #    else
+      #      echo docker login
+      #      echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin
+      #    fi
+      #- name: Docker login for root
+      #  run: |
+      #    if [ "${{ matrix.repos }}" = "guide-liberty-deep-dive-gradle" ]
+      #    then
+      #      echo podman login
+      #      echo $DOCKER_PASSWORD | sudo podman login docker.io -u $DOCKER_USERNAME --password-stdin
+      #    else
+      #      echo docker login
+      #      echo $DOCKER_PASSWORD | sudo docker login -u $DOCKER_USERNAME --password-stdin
+      #    fi
       - name: Run tests for ${{ matrix.repos }}
         working-directory: ${{ matrix.repos }}/finish
         env:
           BUILDLEVEL: ${{ github.event.client_payload.build-level }}${{ github.event.inputs.build }}
           DEVDATE: ${{ github.event.client_payload.dev-date }}${{ github.event.inputs.date }}
           DRIVER: ${{ github.event.client_payload.driver-location }}${{ github.event.inputs.driver }}
-        run: sudo -E ../scripts/dailyBuild.sh -t $DEVDATE -d $DRIVER -b $BUILDLEVEL -u $DOCKER_USERNAME -j ${{ matrix.jdk }}
+        run: sudo -E ../scripts/dailyBuild.sh -t $DEVDATE -d $DRIVER -b $BUILDLEVEL -j ${{ matrix.jdk }}
       - name: Post tests
         working-directory: ${{ matrix.repos }}
         if: always()

diff --git a/.github/workflows/pre-daily-build.yml b/.github/workflows/pre-daily-build.yml
@@ -6,9 +6,9 @@ on:
     # 6 AM UTC or 1 AM EST
     - cron: 0 6 * * *
 
-env:
-  DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-  DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+#env:
+#  DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+#  DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 jobs:
   get-builds:
     runs-on: ubuntu-latest
@@ -38,43 +38,43 @@ jobs:
     steps:
       - name: No builds found
         run: echo "No builds found for $(date -d 'yesterday' '+%Y-%m-%d')"
-  build-docker-image:
-    runs-on: ubuntu-latest
-    needs: get-builds
-    if: ${{ needs.get-builds.outputs.empty == 'false' }}
-    strategy:
-      matrix: ${{ fromJson(needs.get-builds.outputs.matrix) }}
-    env:
-      DHE_URL: https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly
-    steps:
-      - name: Clone ci.docker repository
-        uses: actions/checkout@v2
-        with:
-          repository: OpenLiberty/ci.docker
-          path: ci.docker
-      - name: Docker login
-        run: echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin
-      - name: Build Java 11 Docker image for ${{ matrix.builds.date }}
-        run: |
-          cd ci.docker/releases/latest/full
-          sed -i "s;wget -q \$LIBERTY_DOWNLOAD_URL;wget $DHE_URL/${{ matrix.builds.date }}/${{ matrix.builds.driver_location }};g" Dockerfile.ubi.openjdk11
-          sed -i '/&& sha1sum/d' Dockerfile.ubi.openjdk11
-          cat Dockerfile.ubi.openjdk11
-          echo "Building Java 11 ${{ matrix.builds.build_level }} from ${{ matrix.builds.date }}"
-          docker build -q -t $DOCKER_USERNAME/olguides:${{ matrix.builds.build_level }} -f Dockerfile.ubi.openjdk11 .
-          docker push $DOCKER_USERNAME/olguides:${{ matrix.builds.build_level }}
-      - name: Build Java 17 Docker image for ${{ matrix.builds.date }}
-        run: |
-          cd ci.docker/releases/latest/full
-          sed -i "s;wget -q \$LIBERTY_DOWNLOAD_URL;wget $DHE_URL/${{ matrix.builds.date }}/${{ matrix.builds.driver_location }};g" Dockerfile.ubi.openjdk17
-          sed -i '/&& sha1sum/d' Dockerfile.ubi.openjdk17
-          cat Dockerfile.ubi.openjdk17
-          echo "Building Java 17 ${{ matrix.builds.build_level }} from ${{ matrix.builds.date }}"
-          docker build -q -t $DOCKER_USERNAME/olguides:${{ matrix.builds.build_level }}-java17 -f Dockerfile.ubi.openjdk17 .
-          docker push $DOCKER_USERNAME/olguides:${{ matrix.builds.build_level }}-java17
+#  build-docker-image:
+#    runs-on: ubuntu-latest
+#    needs: get-builds
+#    if: ${{ needs.get-builds.outputs.empty == 'false' }}
+#    strategy:
+#      matrix: ${{ fromJson(needs.get-builds.outputs.matrix) }}
+#    env:
+#      DHE_URL: https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly
+#    steps:
+#      - name: Clone ci.docker repository
+#        uses: actions/checkout@v2
+#        with:
+#          repository: OpenLiberty/ci.docker
+#          path: ci.docker
+#      - name: Docker login
+#        run: echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin
+#      - name: Build Java 11 Docker image for ${{ matrix.builds.date }}
+#        run: |
+#          cd ci.docker/releases/latest/full
+#          sed -i "s;wget -q \$LIBERTY_DOWNLOAD_URL;wget $DHE_URL/${{ matrix.builds.date }}/${{ matrix.builds.driver_location }};g" Dockerfile.ubi.openjdk11
+#          sed -i '/&& sha1sum/d' Dockerfile.ubi.openjdk11
+#          cat Dockerfile.ubi.openjdk11
+#          echo "Building Java 11 ${{ matrix.builds.build_level }} from ${{ matrix.builds.date }}"
+#          docker build -q -t $DOCKER_USERNAME/olguides:${{ matrix.builds.build_level }} -f Dockerfile.ubi.openjdk11 .
+#          docker push $DOCKER_USERNAME/olguides:${{ matrix.builds.build_level }}
+#      - name: Build Java 17 Docker image for ${{ matrix.builds.date }}
+#        run: |
+#          cd ci.docker/releases/latest/full
+#          sed -i "s;wget -q \$LIBERTY_DOWNLOAD_URL;wget $DHE_URL/${{ matrix.builds.date }}/${{ matrix.builds.driver_location }};g" Dockerfile.ubi.openjdk17
+#          sed -i '/&& sha1sum/d' Dockerfile.ubi.openjdk17
+#          cat Dockerfile.ubi.openjdk17
+#          echo "Building Java 17 ${{ matrix.builds.build_level }} from ${{ matrix.builds.date }}"
+#          docker build -q -t $DOCKER_USERNAME/olguides:${{ matrix.builds.build_level }}-java17 -f Dockerfile.ubi.openjdk17 .
+#          docker push $DOCKER_USERNAME/olguides:${{ matrix.builds.build_level }}-java17
   trigger-builds:
     runs-on: ubuntu-latest
-    needs: [ build-docker-image, get-builds ]
+    needs: [ get-builds ]
     if: ${{ needs.get-builds.outputs.empty == 'false' }}
     strategy:
       matrix: ${{ fromJson(needs.get-builds.outputs.matrix) }}