From acd11460818060041c5870ffbf92bc4d5bb12929 Mon Sep 17 00:00:00 2001 From: Justas Balcas Date: Tue, 30 Jan 2024 12:10:44 -0600 Subject: [PATCH] Update builds --- .github/workflows/build-condor-wn.yml | 48 +++++++++++++----- .github/workflows/build-dhcp.yml | 3 +- .github/workflows/build-no-machine.yml | 48 +++++++++++++----- .github/workflows/build-xcache-server.yml | 47 ++++++++++++----- .github/workflows/build-xrootd-mon.yml | 47 ++++++++++++----- .../build-xrootd-stageout-server-sdn.yml | 47 ++++++++++++----- .../build-xrootd-stageout-server.yml | 47 ++++++++++++----- xrootd/xrootd-mon/.swp | Bin 12288 -> 0 bytes 8 files changed, 208 insertions(+), 79 deletions(-) delete mode 100644 xrootd/xrootd-mon/.swp diff --git a/.github/workflows/build-condor-wn.yml b/.github/workflows/build-condor-wn.yml index 1b97827..9a8f5a7 100644 --- a/.github/workflows/build-condor-wn.yml +++ b/.github/workflows/build-condor-wn.yml @@ -1,5 +1,6 @@ name: Docker Image Build For Condor WN + on: workflow_dispatch: inputs: @@ -13,15 +14,13 @@ jobs: runs-on: ubuntu-latest env: DOCKER_USER: ${{secrets.DOCKER_USER}} - DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}} DOCKER_REGISTRY: ${{secrets.DOCKER_REGS}} DOCKER_SDN_USER: ${{secrets.DOCKER_SDN_USER}} - DOCKER_SDN_PASSWORD: ${{secrets.DOCKER_SDN_PASSWORD}} DOCKER_SDN_REGISTRY: ${{secrets.DOCKER_SDN_REGS}} DOCKER_TIER2_USER: ${{secrets.DOCKER_TIER2_USER}} - DOCKER_TIER2_PASSWORD: ${{secrets.DOCKER_TIER2_PASSWORD}} DOCKER_TIER2_REGISTRY: ${{secrets.DOCKER_TIER2_REGS}} - IMAGE_NAME: "cmscaltech/condor-wn" + IMAGE_NAME: "cmscaltech/dhcp" + BUILD_DIR: "cmscaltech-docker/condor-wn" steps: - name: Checkout tools repo uses: actions/checkout@v3 @@ -29,15 +28,38 @@ jobs: repository: cmscaltech/docker path: cmscaltech-docker - - name: docker login - run: | - docker login $DOCKER_REGISTRY -u $DOCKER_USER --password-stdin $DOCKER_PASSWORD - docker login $DOCKER_SDN_REGISTRY -u $DOCKER_SDN_USER --password-stdin $DOCKER_SDN_PASSWORD - docker login $DOCKER_TIER2_REGISTRY -u $DOCKER_TIER2_USER --password-stdin $DOCKER_TIER2_PASSWORD + - name: Login to First Docker Registry + id: dockerOne + if: always() + uses: docker/login-action@v3 + with: + registry: ${{secrets.DOCKER_REGS}} + username: ${{secrets.DOCKER_USER}} + password: ${{secrets.DOCKER_PASSWORD}} + + - name: Login to Second Docker Registry + id: dockerTwo + if: always() + uses: docker/login-action@v3 + with: + registry: ${{secrets.DOCKER_SDN_REGS}} + username: ${{secrets.DOCKER_SDN_USER}} + password: ${{secrets.DOCKER_SDN_PASSWORD}} + + - name: Login to Thrid Docker Registry + id: dockerThree + if: always() + uses: docker/login-action@v3 + with: + registry: ${{secrets.DOCKER_TIER2_REGS}} + username: ${{secrets.DOCKER_TIER2_USER}} + password: ${{secrets.DOCKER_TIER2_PASSWORD}} + - name: Build Docker image id: mainRun + if: always() && (steps.dockerOne.outcome == 'success' || steps.dockerTwo.outcome == 'success' || steps.dockerThree.outcome == 'success') run: | - cd cmscaltech-docker/condor-wn + cd $BUILD_DIR docker build . --file Dockerfile \ --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }} \ --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) \ @@ -47,19 +69,19 @@ jobs: --tag $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) - name: Docker Push Image to first registry - if: always() && steps.mainRun.outcome == 'success' + if: always() && (steps.mainRun.outcome == 'success' && steps.dockerOne.outcome == 'success') run: | docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }} - name: Docker Push Image to second registry - if: always() && steps.mainRun.outcome == 'success' + if: always() && (steps.mainRun.outcome == 'success' && steps.dockerTwo.outcome == 'success') run: | docker push $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }} docker push $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) - name: Docker Push Image to third registry - if: always() && steps.mainRun.outcome == 'success' + if: always() && (steps.mainRun.outcome == 'success' && steps.dockerThree.outcome == 'success') run: | docker push $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }} docker push $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) diff --git a/.github/workflows/build-dhcp.yml b/.github/workflows/build-dhcp.yml index 23734a2..46c2403 100644 --- a/.github/workflows/build-dhcp.yml +++ b/.github/workflows/build-dhcp.yml @@ -19,6 +19,7 @@ jobs: DOCKER_TIER2_USER: ${{secrets.DOCKER_TIER2_USER}} DOCKER_TIER2_REGISTRY: ${{secrets.DOCKER_TIER2_REGS}} IMAGE_NAME: "cmscaltech/dhcp" + BUILD_DIR: "cmscaltech-docker/dhcp" steps: - name: Checkout tools repo uses: actions/checkout@v3 @@ -57,7 +58,7 @@ jobs: id: mainRun if: always() && (steps.dockerOne.outcome == 'success' || steps.dockerTwo.outcome == 'success' || steps.dockerThree.outcome == 'success') run: | - cd cmscaltech-docker/dhcp + cd $BUILD_DIR docker build . --file Dockerfile \ --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }} \ --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) \ diff --git a/.github/workflows/build-no-machine.yml b/.github/workflows/build-no-machine.yml index 22956e8..46e749b 100644 --- a/.github/workflows/build-no-machine.yml +++ b/.github/workflows/build-no-machine.yml @@ -1,5 +1,6 @@ name: Docker Image Build For NoMachine + on: workflow_dispatch: inputs: @@ -13,15 +14,13 @@ jobs: runs-on: ubuntu-latest env: DOCKER_USER: ${{secrets.DOCKER_USER}} - DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}} DOCKER_REGISTRY: ${{secrets.DOCKER_REGS}} DOCKER_SDN_USER: ${{secrets.DOCKER_SDN_USER}} - DOCKER_SDN_PASSWORD: ${{secrets.DOCKER_SDN_PASSWORD}} DOCKER_SDN_REGISTRY: ${{secrets.DOCKER_SDN_REGS}} DOCKER_TIER2_USER: ${{secrets.DOCKER_TIER2_USER}} - DOCKER_TIER2_PASSWORD: ${{secrets.DOCKER_TIER2_PASSWORD}} DOCKER_TIER2_REGISTRY: ${{secrets.DOCKER_TIER2_REGS}} - IMAGE_NAME: "cmscaltech/nomachine" + IMAGE_NAME: "cmscaltech/dhcp" + BUILD_DIR: "cmscaltech-docker/nomachine" steps: - name: Checkout tools repo uses: actions/checkout@v3 @@ -29,15 +28,38 @@ jobs: repository: cmscaltech/docker path: cmscaltech-docker - - name: docker login - run: | - docker login $DOCKER_REGISTRY -u $DOCKER_USER --password-stdin $DOCKER_PASSWORD - docker login $DOCKER_SDN_REGISTRY -u $DOCKER_SDN_USER --password-stdin $DOCKER_SDN_PASSWORD - docker login $DOCKER_TIER2_REGISTRY -u $DOCKER_TIER2_USER --password-stdin $DOCKER_TIER2_PASSWORD + - name: Login to First Docker Registry + id: dockerOne + if: always() + uses: docker/login-action@v3 + with: + registry: ${{secrets.DOCKER_REGS}} + username: ${{secrets.DOCKER_USER}} + password: ${{secrets.DOCKER_PASSWORD}} + + - name: Login to Second Docker Registry + id: dockerTwo + if: always() + uses: docker/login-action@v3 + with: + registry: ${{secrets.DOCKER_SDN_REGS}} + username: ${{secrets.DOCKER_SDN_USER}} + password: ${{secrets.DOCKER_SDN_PASSWORD}} + + - name: Login to Thrid Docker Registry + id: dockerThree + if: always() + uses: docker/login-action@v3 + with: + registry: ${{secrets.DOCKER_TIER2_REGS}} + username: ${{secrets.DOCKER_TIER2_USER}} + password: ${{secrets.DOCKER_TIER2_PASSWORD}} + - name: Build Docker image id: mainRun + if: always() && (steps.dockerOne.outcome == 'success' || steps.dockerTwo.outcome == 'success' || steps.dockerThree.outcome == 'success') run: | - cd cmscaltech-docker/nomachine + cd $BUILD_DIR docker build . --file Dockerfile \ --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }} \ --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) \ @@ -47,19 +69,19 @@ jobs: --tag $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) - name: Docker Push Image to first registry - if: always() && steps.mainRun.outcome == 'success' + if: always() && (steps.mainRun.outcome == 'success' && steps.dockerOne.outcome == 'success') run: | docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }} - name: Docker Push Image to second registry - if: always() && steps.mainRun.outcome == 'success' + if: always() && (steps.mainRun.outcome == 'success' && steps.dockerTwo.outcome == 'success') run: | docker push $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }} docker push $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) - name: Docker Push Image to third registry - if: always() && steps.mainRun.outcome == 'success' + if: always() && (steps.mainRun.outcome == 'success' && steps.dockerThree.outcome == 'success') run: | docker push $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }} docker push $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) diff --git a/.github/workflows/build-xcache-server.yml b/.github/workflows/build-xcache-server.yml index 6b8aca7..9c8d515 100644 --- a/.github/workflows/build-xcache-server.yml +++ b/.github/workflows/build-xcache-server.yml @@ -13,15 +13,13 @@ jobs: runs-on: ubuntu-latest env: DOCKER_USER: ${{secrets.DOCKER_USER}} - DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}} DOCKER_REGISTRY: ${{secrets.DOCKER_REGS}} DOCKER_SDN_USER: ${{secrets.DOCKER_SDN_USER}} - DOCKER_SDN_PASSWORD: ${{secrets.DOCKER_SDN_PASSWORD}} DOCKER_SDN_REGISTRY: ${{secrets.DOCKER_SDN_REGS}} DOCKER_TIER2_USER: ${{secrets.DOCKER_TIER2_USER}} - DOCKER_TIER2_PASSWORD: ${{secrets.DOCKER_TIER2_PASSWORD}} DOCKER_TIER2_REGISTRY: ${{secrets.DOCKER_TIER2_REGS}} - IMAGE_NAME: "cmscaltech/xcache-server" + IMAGE_NAME: "cmscaltech/dhcp" + BUILD_DIR: "cmscaltech-docker/xrootd/xcache-server/" steps: - name: Checkout tools repo uses: actions/checkout@v3 @@ -29,15 +27,38 @@ jobs: repository: cmscaltech/docker path: cmscaltech-docker - - name: docker login - run: | - docker login $DOCKER_REGISTRY -u $DOCKER_USER --password-stdin $DOCKER_PASSWORD - docker login $DOCKER_SDN_REGISTRY -u $DOCKER_SDN_USER --password-stdin $DOCKER_SDN_PASSWORD - docker login $DOCKER_TIER2_REGISTRY -u $DOCKER_TIER2_USER --password-stdin $DOCKER_TIER2_PASSWORD + - name: Login to First Docker Registry + id: dockerOne + if: always() + uses: docker/login-action@v3 + with: + registry: ${{secrets.DOCKER_REGS}} + username: ${{secrets.DOCKER_USER}} + password: ${{secrets.DOCKER_PASSWORD}} + + - name: Login to Second Docker Registry + id: dockerTwo + if: always() + uses: docker/login-action@v3 + with: + registry: ${{secrets.DOCKER_SDN_REGS}} + username: ${{secrets.DOCKER_SDN_USER}} + password: ${{secrets.DOCKER_SDN_PASSWORD}} + + - name: Login to Thrid Docker Registry + id: dockerThree + if: always() + uses: docker/login-action@v3 + with: + registry: ${{secrets.DOCKER_TIER2_REGS}} + username: ${{secrets.DOCKER_TIER2_USER}} + password: ${{secrets.DOCKER_TIER2_PASSWORD}} + - name: Build Docker image id: mainRun + if: always() && (steps.dockerOne.outcome == 'success' || steps.dockerTwo.outcome == 'success' || steps.dockerThree.outcome == 'success') run: | - cd cmscaltech-docker/xrootd/xcache-server/ + cd $BUILD_DIR docker build . --file Dockerfile \ --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }} \ --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) \ @@ -47,19 +68,19 @@ jobs: --tag $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) - name: Docker Push Image to first registry - if: always() && steps.mainRun.outcome == 'success' + if: always() && (steps.mainRun.outcome == 'success' && steps.dockerOne.outcome == 'success') run: | docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }} - name: Docker Push Image to second registry - if: always() && steps.mainRun.outcome == 'success' + if: always() && (steps.mainRun.outcome == 'success' && steps.dockerTwo.outcome == 'success') run: | docker push $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }} docker push $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) - name: Docker Push Image to third registry - if: always() && steps.mainRun.outcome == 'success' + if: always() && (steps.mainRun.outcome == 'success' && steps.dockerThree.outcome == 'success') run: | docker push $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }} docker push $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) diff --git a/.github/workflows/build-xrootd-mon.yml b/.github/workflows/build-xrootd-mon.yml index 867a55c..9f0975c 100644 --- a/.github/workflows/build-xrootd-mon.yml +++ b/.github/workflows/build-xrootd-mon.yml @@ -13,15 +13,13 @@ jobs: runs-on: ubuntu-latest env: DOCKER_USER: ${{secrets.DOCKER_USER}} - DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}} DOCKER_REGISTRY: ${{secrets.DOCKER_REGS}} DOCKER_SDN_USER: ${{secrets.DOCKER_SDN_USER}} - DOCKER_SDN_PASSWORD: ${{secrets.DOCKER_SDN_PASSWORD}} DOCKER_SDN_REGISTRY: ${{secrets.DOCKER_SDN_REGS}} DOCKER_TIER2_USER: ${{secrets.DOCKER_TIER2_USER}} - DOCKER_TIER2_PASSWORD: ${{secrets.DOCKER_TIER2_PASSWORD}} DOCKER_TIER2_REGISTRY: ${{secrets.DOCKER_TIER2_REGS}} - IMAGE_NAME: "cmscaltech/xrootd-mon" + IMAGE_NAME: "cmscaltech/dhcp" + BUILD_DIR: "cmscaltech-docker/xrootd/xrootd-mon/" steps: - name: Checkout tools repo uses: actions/checkout@v3 @@ -29,15 +27,38 @@ jobs: repository: cmscaltech/docker path: cmscaltech-docker - - name: docker login - run: | - docker login $DOCKER_REGISTRY -u $DOCKER_USER --password-stdin $DOCKER_PASSWORD - docker login $DOCKER_SDN_REGISTRY -u $DOCKER_SDN_USER --password-stdin $DOCKER_SDN_PASSWORD - docker login $DOCKER_TIER2_REGISTRY -u $DOCKER_TIER2_USER --password-stdin $DOCKER_TIER2_PASSWORD + - name: Login to First Docker Registry + id: dockerOne + if: always() + uses: docker/login-action@v3 + with: + registry: ${{secrets.DOCKER_REGS}} + username: ${{secrets.DOCKER_USER}} + password: ${{secrets.DOCKER_PASSWORD}} + + - name: Login to Second Docker Registry + id: dockerTwo + if: always() + uses: docker/login-action@v3 + with: + registry: ${{secrets.DOCKER_SDN_REGS}} + username: ${{secrets.DOCKER_SDN_USER}} + password: ${{secrets.DOCKER_SDN_PASSWORD}} + + - name: Login to Thrid Docker Registry + id: dockerThree + if: always() + uses: docker/login-action@v3 + with: + registry: ${{secrets.DOCKER_TIER2_REGS}} + username: ${{secrets.DOCKER_TIER2_USER}} + password: ${{secrets.DOCKER_TIER2_PASSWORD}} + - name: Build Docker image id: mainRun + if: always() && (steps.dockerOne.outcome == 'success' || steps.dockerTwo.outcome == 'success' || steps.dockerThree.outcome == 'success') run: | - cd cmscaltech-docker/xrootd/xrootd-mon/ + cd $BUILD_DIR docker build . --file Dockerfile \ --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }} \ --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) \ @@ -47,19 +68,19 @@ jobs: --tag $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) - name: Docker Push Image to first registry - if: always() && steps.mainRun.outcome == 'success' + if: always() && (steps.mainRun.outcome == 'success' && steps.dockerOne.outcome == 'success') run: | docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }} - name: Docker Push Image to second registry - if: always() && steps.mainRun.outcome == 'success' + if: always() && (steps.mainRun.outcome == 'success' && steps.dockerTwo.outcome == 'success') run: | docker push $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }} docker push $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) - name: Docker Push Image to third registry - if: always() && steps.mainRun.outcome == 'success' + if: always() && (steps.mainRun.outcome == 'success' && steps.dockerThree.outcome == 'success') run: | docker push $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }} docker push $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) diff --git a/.github/workflows/build-xrootd-stageout-server-sdn.yml b/.github/workflows/build-xrootd-stageout-server-sdn.yml index 6fb74f0..4df28d8 100644 --- a/.github/workflows/build-xrootd-stageout-server-sdn.yml +++ b/.github/workflows/build-xrootd-stageout-server-sdn.yml @@ -13,15 +13,13 @@ jobs: runs-on: ubuntu-latest env: DOCKER_USER: ${{secrets.DOCKER_USER}} - DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}} DOCKER_REGISTRY: ${{secrets.DOCKER_REGS}} DOCKER_SDN_USER: ${{secrets.DOCKER_SDN_USER}} - DOCKER_SDN_PASSWORD: ${{secrets.DOCKER_SDN_PASSWORD}} DOCKER_SDN_REGISTRY: ${{secrets.DOCKER_SDN_REGS}} DOCKER_TIER2_USER: ${{secrets.DOCKER_TIER2_USER}} - DOCKER_TIER2_PASSWORD: ${{secrets.DOCKER_TIER2_PASSWORD}} DOCKER_TIER2_REGISTRY: ${{secrets.DOCKER_TIER2_REGS}} - IMAGE_NAME: "cmscaltech/xrootd-stageout-server-sdn" + IMAGE_NAME: "cmscaltech/dhcp" + BUILD_DIR: "cmscaltech-docker/xrootd/xrootd-stageout-server-sdn/" steps: - name: Checkout tools repo uses: actions/checkout@v3 @@ -29,15 +27,38 @@ jobs: repository: cmscaltech/docker path: cmscaltech-docker - - name: docker login - run: | - docker login $DOCKER_REGISTRY -u $DOCKER_USER --password-stdin $DOCKER_PASSWORD - docker login $DOCKER_SDN_REGISTRY -u $DOCKER_SDN_USER --password-stdin $DOCKER_SDN_PASSWORD - docker login $DOCKER_TIER2_REGISTRY -u $DOCKER_TIER2_USER --password-stdin $DOCKER_TIER2_PASSWORD + - name: Login to First Docker Registry + id: dockerOne + if: always() + uses: docker/login-action@v3 + with: + registry: ${{secrets.DOCKER_REGS}} + username: ${{secrets.DOCKER_USER}} + password: ${{secrets.DOCKER_PASSWORD}} + + - name: Login to Second Docker Registry + id: dockerTwo + if: always() + uses: docker/login-action@v3 + with: + registry: ${{secrets.DOCKER_SDN_REGS}} + username: ${{secrets.DOCKER_SDN_USER}} + password: ${{secrets.DOCKER_SDN_PASSWORD}} + + - name: Login to Thrid Docker Registry + id: dockerThree + if: always() + uses: docker/login-action@v3 + with: + registry: ${{secrets.DOCKER_TIER2_REGS}} + username: ${{secrets.DOCKER_TIER2_USER}} + password: ${{secrets.DOCKER_TIER2_PASSWORD}} + - name: Build Docker image id: mainRun + if: always() && (steps.dockerOne.outcome == 'success' || steps.dockerTwo.outcome == 'success' || steps.dockerThree.outcome == 'success') run: | - cd cmscaltech-docker/xrootd/xrootd-stageout-server-sdn/ + cd $BUILD_DIR docker build . --file Dockerfile \ --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }} \ --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) \ @@ -47,19 +68,19 @@ jobs: --tag $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) - name: Docker Push Image to first registry - if: always() && steps.mainRun.outcome == 'success' + if: always() && (steps.mainRun.outcome == 'success' && steps.dockerOne.outcome == 'success') run: | docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }} - name: Docker Push Image to second registry - if: always() && steps.mainRun.outcome == 'success' + if: always() && (steps.mainRun.outcome == 'success' && steps.dockerTwo.outcome == 'success') run: | docker push $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }} docker push $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) - name: Docker Push Image to third registry - if: always() && steps.mainRun.outcome == 'success' + if: always() && (steps.mainRun.outcome == 'success' && steps.dockerThree.outcome == 'success') run: | docker push $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }} docker push $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) diff --git a/.github/workflows/build-xrootd-stageout-server.yml b/.github/workflows/build-xrootd-stageout-server.yml index 1f38c20..85be594 100644 --- a/.github/workflows/build-xrootd-stageout-server.yml +++ b/.github/workflows/build-xrootd-stageout-server.yml @@ -13,15 +13,13 @@ jobs: runs-on: ubuntu-latest env: DOCKER_USER: ${{secrets.DOCKER_USER}} - DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}} DOCKER_REGISTRY: ${{secrets.DOCKER_REGS}} DOCKER_SDN_USER: ${{secrets.DOCKER_SDN_USER}} - DOCKER_SDN_PASSWORD: ${{secrets.DOCKER_SDN_PASSWORD}} DOCKER_SDN_REGISTRY: ${{secrets.DOCKER_SDN_REGS}} DOCKER_TIER2_USER: ${{secrets.DOCKER_TIER2_USER}} - DOCKER_TIER2_PASSWORD: ${{secrets.DOCKER_TIER2_PASSWORD}} DOCKER_TIER2_REGISTRY: ${{secrets.DOCKER_TIER2_REGS}} - IMAGE_NAME: "cmscaltech/xrootd-stageout-server" + IMAGE_NAME: "cmscaltech/dhcp" + BUILD_DIR: "cmscaltech-docker/xrootd/xrootd-stageout-server/" steps: - name: Checkout tools repo uses: actions/checkout@v3 @@ -29,15 +27,38 @@ jobs: repository: cmscaltech/docker path: cmscaltech-docker - - name: docker login - run: | - docker login $DOCKER_REGISTRY -u $DOCKER_USER --password-stdin $DOCKER_PASSWORD - docker login $DOCKER_SDN_REGISTRY -u $DOCKER_SDN_USER --password-stdin $DOCKER_SDN_PASSWORD - docker login $DOCKER_TIER2_REGISTRY -u $DOCKER_TIER2_USER --password-stdin $DOCKER_TIER2_PASSWORD + - name: Login to First Docker Registry + id: dockerOne + if: always() + uses: docker/login-action@v3 + with: + registry: ${{secrets.DOCKER_REGS}} + username: ${{secrets.DOCKER_USER}} + password: ${{secrets.DOCKER_PASSWORD}} + + - name: Login to Second Docker Registry + id: dockerTwo + if: always() + uses: docker/login-action@v3 + with: + registry: ${{secrets.DOCKER_SDN_REGS}} + username: ${{secrets.DOCKER_SDN_USER}} + password: ${{secrets.DOCKER_SDN_PASSWORD}} + + - name: Login to Thrid Docker Registry + id: dockerThree + if: always() + uses: docker/login-action@v3 + with: + registry: ${{secrets.DOCKER_TIER2_REGS}} + username: ${{secrets.DOCKER_TIER2_USER}} + password: ${{secrets.DOCKER_TIER2_PASSWORD}} + - name: Build Docker image id: mainRun + if: always() && (steps.dockerOne.outcome == 'success' || steps.dockerTwo.outcome == 'success' || steps.dockerThree.outcome == 'success') run: | - cd cmscaltech-docker/xrootd/xrootd-stageout-server/ + cd $BUILD_DIR docker build . --file Dockerfile \ --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }} \ --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) \ @@ -47,19 +68,19 @@ jobs: --tag $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) - name: Docker Push Image to first registry - if: always() && steps.mainRun.outcome == 'success' + if: always() && (steps.mainRun.outcome == 'success' && steps.dockerOne.outcome == 'success') run: | docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }} - name: Docker Push Image to second registry - if: always() && steps.mainRun.outcome == 'success' + if: always() && (steps.mainRun.outcome == 'success' && steps.dockerTwo.outcome == 'success') run: | docker push $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }} docker push $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) - name: Docker Push Image to third registry - if: always() && steps.mainRun.outcome == 'success' + if: always() && (steps.mainRun.outcome == 'success' && steps.dockerThree.outcome == 'success') run: | docker push $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }} docker push $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) diff --git a/xrootd/xrootd-mon/.swp b/xrootd/xrootd-mon/.swp deleted file mode 100644 index 6c208645ead66458eb6aa4be4685b4e5f02dac2b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI&F%E(-7>3~=Hz$o=0CmQqPOfg6IO1Nx1<)Fb(apnn2oK_g1jLbzgyn4le<%%K z^CTUba`X?|y}O?KQnX=t`?dHb5+8LMYWweMth<}dwe>dD=y_^Foi>i;1p)|kCD0F6 z%SE-+XVZy09tB-Zgj@s=KmY**5I_I{1Q6&zAip~DEOL8ww$o5Mm>Q7?Ab9 cnN{`Q`|578L`5b{PMLaS#^h05ytBE;7YSx1Bme*a