Skip to content

Commit

Permalink
Remove el7
Browse files Browse the repository at this point in the history
  • Loading branch information
RicardoMDomingues committed Sep 25, 2024
1 parent f334277 commit f12ce47
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 214 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cve-scanning.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
folder-name: ["aws-linux", "el7", "el8", "ubuntu-focal-deb", "ubuntu-focal" ]
folder-name: ["aws-linux", "el8", "ubuntu-focal-deb", "ubuntu-focal" ]
steps:
- uses: actions/checkout@v3
- uses: docker/setup-buildx-action@v3
Expand Down
16 changes: 2 additions & 14 deletions Jenkins/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,6 @@ node('be-integration') {

sh "gcloud auth configure-docker europe-west1-docker.pkg.dev --quiet"

docker.image('europe-west1-docker.pkg.dev/sym-dev-rtc/rtc-jenkins-tools/buildsmb-el7:latest').inside {
stage('Build Centos 7') {
env.GIT_COMMITTER_NAME = "Jenkins deployment job"
env.GIT_COMMITTER_EMAIL = "[email protected]"
sh "docker/el7/buildscript.sh Release"
}

stage('Run tests centos7') {
sh "docker/el7/runtests.sh"
}
}

docker.image('europe-west1-docker.pkg.dev/sym-dev-rtc/rtc-jenkins-tools/buildsmb-el8:latest').inside {
stage('Build RHEL 8') {
env.GIT_COMMITTER_NAME = "Jenkins deployment job"
Expand Down Expand Up @@ -98,9 +86,9 @@ node('be-integration') {
}
}

docker.image('europe-west1-docker.pkg.dev/sym-dev-rtc/rtc-jenkins-tools/buildsmb-el7:latest').inside {
docker.image('europe-west1-docker.pkg.dev/sym-dev-rtc/rtc-jenkins-tools/buildsmb-ubuntu-focal-deb:latest').inside {
stage('Create archive') {
sh "zip -r ${baseName}-${version}.zip el7/smb/smb el7/smb/versioninfo.txt el7/smb/libs/ el8/smb/smb el8/smb/versioninfo.txt el8/smb/libs/ ubuntu-jammy/smb/smb ubuntu-jammy/smb/versioninfo.txt ubuntu-jammy/smb/libs/ ubuntu-focal-deb/smb/*.tar.gz ubuntu-focal-deb/smb/*.deb aws-linux/smb/versioninfo.txt aws-linux/smb/libs/ aws-linux/smb/smb"
sh "zip -r ${baseName}-${version}.zip el8/smb/smb el8/smb/versioninfo.txt el8/smb/libs/ ubuntu-jammy/smb/smb ubuntu-jammy/smb/versioninfo.txt ubuntu-jammy/smb/libs/ ubuntu-focal-deb/smb/*.tar.gz ubuntu-focal-deb/smb/*.deb aws-linux/smb/versioninfo.txt aws-linux/smb/libs/ aws-linux/smb/smb"
}
}

Expand Down
7 changes: 2 additions & 5 deletions Jenkins/PRUnitTestRunner.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,8 @@ void prRunner(String cmakeBuildType, String platform, String dockerTag) {
}

abortPreviousRunningBuilds()
parallel "Release el7": {
node('be-integration') {
prRunner("Release", "el7", "latest")
}
}, "Release AWS-linux": {

parallel "Release AWS-linux": {
node('be-integration') {
prRunner("Release", "aws-linux", "latest")
}
Expand Down
87 changes: 0 additions & 87 deletions docker/el7/Dockerfile

This file was deleted.

53 changes: 0 additions & 53 deletions docker/el7/buildscript.sh

This file was deleted.

9 changes: 0 additions & 9 deletions docker/el7/generate_makefile.sh

This file was deleted.

44 changes: 0 additions & 44 deletions docker/el7/runtests.sh

This file was deleted.

2 changes: 1 addition & 1 deletion docker/prepdocker.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
if [ "$#" -ne 1 ]; then
echo "Usage prepdocker.sh <el7|el8|ubuntu-focal|ubuntu-jammy|aws-linux>. Eg. prepdocker.sh el8"
echo "Usage prepdocker.sh <el8|ubuntu-focal|ubuntu-jammy|aws-linux>. Eg. prepdocker.sh el8"
exit
fi

Expand Down

0 comments on commit f12ce47

Please sign in to comment.