From 68fd2035cd4129bc7799b26179138ed02bb93f7e Mon Sep 17 00:00:00 2001 From: Chip Senkbeil Date: Sun, 26 Sep 2021 21:30:50 -0500 Subject: [PATCH] Rebase and re-apply openssh-server addition to CIs --- .github/workflows/gen_centos7.yml | 3 +++ .github/workflows/gen_centos7_continuous.yml | 5 +++++ .github/workflows/gen_centos7_tag.yml | 3 +++ .github/workflows/gen_centos8.yml | 3 +++ .github/workflows/gen_centos8_continuous.yml | 5 +++++ .github/workflows/gen_centos8_tag.yml | 3 +++ .github/workflows/gen_debian10.3.yml | 3 +++ .github/workflows/gen_debian10.3_continuous.yml | 5 +++++ .github/workflows/gen_debian10.3_tag.yml | 3 +++ .github/workflows/gen_debian11.yml | 3 +++ .github/workflows/gen_debian11_continuous.yml | 5 +++++ .github/workflows/gen_debian11_tag.yml | 3 +++ .github/workflows/gen_debian9.12.yml | 3 +++ .github/workflows/gen_debian9.12_continuous.yml | 5 +++++ .github/workflows/gen_debian9.12_tag.yml | 3 +++ .github/workflows/gen_fedora33.yml | 3 +++ .github/workflows/gen_fedora33_continuous.yml | 5 +++++ .github/workflows/gen_fedora33_tag.yml | 3 +++ .github/workflows/gen_fedora34.yml | 3 +++ .github/workflows/gen_fedora34_continuous.yml | 5 +++++ .github/workflows/gen_fedora34_tag.yml | 3 +++ .github/workflows/gen_ubuntu20.04.yml | 3 +++ .github/workflows/gen_ubuntu20.04_continuous.yml | 5 +++++ .github/workflows/gen_ubuntu20.04_tag.yml | 3 +++ ci/generate-workflows.py | 6 ++++++ 25 files changed, 94 insertions(+) diff --git a/.github/workflows/gen_centos7.yml b/.github/workflows/gen_centos7.yml index e9a1adf9c..f7792e65c 100644 --- a/.github/workflows/gen_centos7.yml +++ b/.github/workflows/gen_centos7.yml @@ -45,6 +45,9 @@ jobs: - name: "Install curl" shell: bash run: "yum install -y curl" + - name: "Install openssh-server" + shell: bash + run: "yum install -y openssh-server" - name: "checkout repo" uses: actions/checkout@v2 with: diff --git a/.github/workflows/gen_centos7_continuous.yml b/.github/workflows/gen_centos7_continuous.yml index 24475dcf6..731a93201 100644 --- a/.github/workflows/gen_centos7_continuous.yml +++ b/.github/workflows/gen_centos7_continuous.yml @@ -54,6 +54,11 @@ jobs: run: | export BUILD_REASON=Schedule yum install -y curl + - name: "Install openssh-server" + shell: bash + run: | + export BUILD_REASON=Schedule + yum install -y openssh-server - name: "checkout repo" uses: actions/checkout@v2 with: diff --git a/.github/workflows/gen_centos7_tag.yml b/.github/workflows/gen_centos7_tag.yml index bd37a58ca..d6fb4215a 100644 --- a/.github/workflows/gen_centos7_tag.yml +++ b/.github/workflows/gen_centos7_tag.yml @@ -36,6 +36,9 @@ jobs: - name: "Install curl" shell: bash run: "yum install -y curl" + - name: "Install openssh-server" + shell: bash + run: "yum install -y openssh-server" - name: "checkout repo" uses: actions/checkout@v2 with: diff --git a/.github/workflows/gen_centos8.yml b/.github/workflows/gen_centos8.yml index 30500463f..4a03b5fb7 100644 --- a/.github/workflows/gen_centos8.yml +++ b/.github/workflows/gen_centos8.yml @@ -31,6 +31,9 @@ jobs: - name: "Install curl" shell: bash run: "yum install -y curl" + - name: "Install openssh-server" + shell: bash + run: "yum install -y openssh-server" - name: "checkout repo" uses: actions/checkout@v2 with: diff --git a/.github/workflows/gen_centos8_continuous.yml b/.github/workflows/gen_centos8_continuous.yml index 5e02fa915..183a962e3 100644 --- a/.github/workflows/gen_centos8_continuous.yml +++ b/.github/workflows/gen_centos8_continuous.yml @@ -41,6 +41,11 @@ jobs: run: | export BUILD_REASON=Schedule yum install -y curl + - name: "Install openssh-server" + shell: bash + run: | + export BUILD_REASON=Schedule + yum install -y openssh-server - name: "checkout repo" uses: actions/checkout@v2 with: diff --git a/.github/workflows/gen_centos8_tag.yml b/.github/workflows/gen_centos8_tag.yml index 992c59835..aa9f79dc4 100644 --- a/.github/workflows/gen_centos8_tag.yml +++ b/.github/workflows/gen_centos8_tag.yml @@ -22,6 +22,9 @@ jobs: - name: "Install curl" shell: bash run: "yum install -y curl" + - name: "Install openssh-server" + shell: bash + run: "yum install -y openssh-server" - name: "checkout repo" uses: actions/checkout@v2 with: diff --git a/.github/workflows/gen_debian10.3.yml b/.github/workflows/gen_debian10.3.yml index 7751d3d41..622e3bdcf 100644 --- a/.github/workflows/gen_debian10.3.yml +++ b/.github/workflows/gen_debian10.3.yml @@ -31,6 +31,9 @@ jobs: - name: "Install curl" shell: bash run: "apt-get install -y curl" + - name: "Install openssh-server" + shell: bash + run: "apt-get install -y openssh-server" - name: "checkout repo" uses: actions/checkout@v2 with: diff --git a/.github/workflows/gen_debian10.3_continuous.yml b/.github/workflows/gen_debian10.3_continuous.yml index 43fbc84f1..fdbbe2c82 100644 --- a/.github/workflows/gen_debian10.3_continuous.yml +++ b/.github/workflows/gen_debian10.3_continuous.yml @@ -41,6 +41,11 @@ jobs: run: | export BUILD_REASON=Schedule apt-get install -y curl + - name: "Install openssh-server" + shell: bash + run: | + export BUILD_REASON=Schedule + apt-get install -y openssh-server - name: "checkout repo" uses: actions/checkout@v2 with: diff --git a/.github/workflows/gen_debian10.3_tag.yml b/.github/workflows/gen_debian10.3_tag.yml index 9d8e4ab72..19126ee1f 100644 --- a/.github/workflows/gen_debian10.3_tag.yml +++ b/.github/workflows/gen_debian10.3_tag.yml @@ -22,6 +22,9 @@ jobs: - name: "Install curl" shell: bash run: "apt-get install -y curl" + - name: "Install openssh-server" + shell: bash + run: "apt-get install -y openssh-server" - name: "checkout repo" uses: actions/checkout@v2 with: diff --git a/.github/workflows/gen_debian11.yml b/.github/workflows/gen_debian11.yml index aa8274d41..6115394ab 100644 --- a/.github/workflows/gen_debian11.yml +++ b/.github/workflows/gen_debian11.yml @@ -31,6 +31,9 @@ jobs: - name: "Install curl" shell: bash run: "apt-get install -y curl" + - name: "Install openssh-server" + shell: bash + run: "apt-get install -y openssh-server" - name: "checkout repo" uses: actions/checkout@v2 with: diff --git a/.github/workflows/gen_debian11_continuous.yml b/.github/workflows/gen_debian11_continuous.yml index 389dc5e27..739cdeef7 100644 --- a/.github/workflows/gen_debian11_continuous.yml +++ b/.github/workflows/gen_debian11_continuous.yml @@ -41,6 +41,11 @@ jobs: run: | export BUILD_REASON=Schedule apt-get install -y curl + - name: "Install openssh-server" + shell: bash + run: | + export BUILD_REASON=Schedule + apt-get install -y openssh-server - name: "checkout repo" uses: actions/checkout@v2 with: diff --git a/.github/workflows/gen_debian11_tag.yml b/.github/workflows/gen_debian11_tag.yml index 036a50801..986cd538f 100644 --- a/.github/workflows/gen_debian11_tag.yml +++ b/.github/workflows/gen_debian11_tag.yml @@ -22,6 +22,9 @@ jobs: - name: "Install curl" shell: bash run: "apt-get install -y curl" + - name: "Install openssh-server" + shell: bash + run: "apt-get install -y openssh-server" - name: "checkout repo" uses: actions/checkout@v2 with: diff --git a/.github/workflows/gen_debian9.12.yml b/.github/workflows/gen_debian9.12.yml index c6068d056..549c43c2c 100644 --- a/.github/workflows/gen_debian9.12.yml +++ b/.github/workflows/gen_debian9.12.yml @@ -45,6 +45,9 @@ jobs: - name: "Install curl" shell: bash run: "apt-get install -y curl" + - name: "Install openssh-server" + shell: bash + run: "apt-get install -y openssh-server" - name: "checkout repo" uses: actions/checkout@v2 with: diff --git a/.github/workflows/gen_debian9.12_continuous.yml b/.github/workflows/gen_debian9.12_continuous.yml index 20fd5c630..1c9673187 100644 --- a/.github/workflows/gen_debian9.12_continuous.yml +++ b/.github/workflows/gen_debian9.12_continuous.yml @@ -54,6 +54,11 @@ jobs: run: | export BUILD_REASON=Schedule apt-get install -y curl + - name: "Install openssh-server" + shell: bash + run: | + export BUILD_REASON=Schedule + apt-get install -y openssh-server - name: "checkout repo" uses: actions/checkout@v2 with: diff --git a/.github/workflows/gen_debian9.12_tag.yml b/.github/workflows/gen_debian9.12_tag.yml index 074f9f7f7..12a55d80e 100644 --- a/.github/workflows/gen_debian9.12_tag.yml +++ b/.github/workflows/gen_debian9.12_tag.yml @@ -36,6 +36,9 @@ jobs: - name: "Install curl" shell: bash run: "apt-get install -y curl" + - name: "Install openssh-server" + shell: bash + run: "apt-get install -y openssh-server" - name: "checkout repo" uses: actions/checkout@v2 with: diff --git a/.github/workflows/gen_fedora33.yml b/.github/workflows/gen_fedora33.yml index 8eab18406..fc7e13cac 100644 --- a/.github/workflows/gen_fedora33.yml +++ b/.github/workflows/gen_fedora33.yml @@ -25,6 +25,9 @@ jobs: - name: "Install curl" shell: bash run: "yum install -y curl" + - name: "Install openssh-server" + shell: bash + run: "yum install -y openssh-server" - name: "checkout repo" uses: actions/checkout@v2 with: diff --git a/.github/workflows/gen_fedora33_continuous.yml b/.github/workflows/gen_fedora33_continuous.yml index faf3f5566..e22143813 100644 --- a/.github/workflows/gen_fedora33_continuous.yml +++ b/.github/workflows/gen_fedora33_continuous.yml @@ -31,6 +31,11 @@ jobs: run: | export BUILD_REASON=Schedule yum install -y curl + - name: "Install openssh-server" + shell: bash + run: | + export BUILD_REASON=Schedule + yum install -y openssh-server - name: "checkout repo" uses: actions/checkout@v2 with: diff --git a/.github/workflows/gen_fedora33_tag.yml b/.github/workflows/gen_fedora33_tag.yml index 0b2459e1e..a1249c4e1 100644 --- a/.github/workflows/gen_fedora33_tag.yml +++ b/.github/workflows/gen_fedora33_tag.yml @@ -16,6 +16,9 @@ jobs: - name: "Install curl" shell: bash run: "yum install -y curl" + - name: "Install openssh-server" + shell: bash + run: "yum install -y openssh-server" - name: "checkout repo" uses: actions/checkout@v2 with: diff --git a/.github/workflows/gen_fedora34.yml b/.github/workflows/gen_fedora34.yml index b0d37406a..906141cea 100644 --- a/.github/workflows/gen_fedora34.yml +++ b/.github/workflows/gen_fedora34.yml @@ -25,6 +25,9 @@ jobs: - name: "Install curl" shell: bash run: "yum install -y curl" + - name: "Install openssh-server" + shell: bash + run: "yum install -y openssh-server" - name: "checkout repo" uses: actions/checkout@v2 with: diff --git a/.github/workflows/gen_fedora34_continuous.yml b/.github/workflows/gen_fedora34_continuous.yml index 691d18aa9..f68650d5f 100644 --- a/.github/workflows/gen_fedora34_continuous.yml +++ b/.github/workflows/gen_fedora34_continuous.yml @@ -31,6 +31,11 @@ jobs: run: | export BUILD_REASON=Schedule yum install -y curl + - name: "Install openssh-server" + shell: bash + run: | + export BUILD_REASON=Schedule + yum install -y openssh-server - name: "checkout repo" uses: actions/checkout@v2 with: diff --git a/.github/workflows/gen_fedora34_tag.yml b/.github/workflows/gen_fedora34_tag.yml index d2f28a37c..6b6f893b5 100644 --- a/.github/workflows/gen_fedora34_tag.yml +++ b/.github/workflows/gen_fedora34_tag.yml @@ -16,6 +16,9 @@ jobs: - name: "Install curl" shell: bash run: "yum install -y curl" + - name: "Install openssh-server" + shell: bash + run: "yum install -y openssh-server" - name: "checkout repo" uses: actions/checkout@v2 with: diff --git a/.github/workflows/gen_ubuntu20.04.yml b/.github/workflows/gen_ubuntu20.04.yml index 9511c4c78..810361b76 100644 --- a/.github/workflows/gen_ubuntu20.04.yml +++ b/.github/workflows/gen_ubuntu20.04.yml @@ -31,6 +31,9 @@ jobs: - name: "Install curl" shell: bash run: "apt-get install -y curl" + - name: "Install openssh-server" + shell: bash + run: "apt-get install -y openssh-server" - name: "checkout repo" uses: actions/checkout@v2 with: diff --git a/.github/workflows/gen_ubuntu20.04_continuous.yml b/.github/workflows/gen_ubuntu20.04_continuous.yml index 8791d04b4..dac5ae39a 100644 --- a/.github/workflows/gen_ubuntu20.04_continuous.yml +++ b/.github/workflows/gen_ubuntu20.04_continuous.yml @@ -41,6 +41,11 @@ jobs: run: | export BUILD_REASON=Schedule apt-get install -y curl + - name: "Install openssh-server" + shell: bash + run: | + export BUILD_REASON=Schedule + apt-get install -y openssh-server - name: "checkout repo" uses: actions/checkout@v2 with: diff --git a/.github/workflows/gen_ubuntu20.04_tag.yml b/.github/workflows/gen_ubuntu20.04_tag.yml index 7ea4da894..3555d61c5 100644 --- a/.github/workflows/gen_ubuntu20.04_tag.yml +++ b/.github/workflows/gen_ubuntu20.04_tag.yml @@ -22,6 +22,9 @@ jobs: - name: "Install curl" shell: bash run: "apt-get install -y curl" + - name: "Install openssh-server" + shell: bash + run: "apt-get install -y openssh-server" - name: "checkout repo" uses: actions/checkout@v2 with: diff --git a/ci/generate-workflows.py b/ci/generate-workflows.py index 383e829d5..e2117691d 100755 --- a/ci/generate-workflows.py +++ b/ci/generate-workflows.py @@ -160,6 +160,11 @@ class Target(object): return self.install_system_package("curl") return [] + def install_openssh_server(self): + if self.uses_yum() or (self.uses_apt() and self.container): + return self.install_system_package("openssh-server") + return [] + def install_newer_compiler(self): steps = [] if self.name == "centos7": @@ -493,6 +498,7 @@ cargo build --all --release""", steps += self.install_newer_compiler() steps += self.install_git() steps += self.install_curl() + steps += self.install_openssh_server() steps += [ CheckoutStep(), # We need tags in order to use git describe for build/packaging