#316 Add ldap to requirements
Closed 2 years ago by gnaponie. Opened 2 years ago by gnaponie.
gnaponie/waiverdb ldap-deps  into  master

@@ -176,6 +176,7 @@ 

      }

      stage('Run unit tests') {

        steps {

+         sh 'dnf install -y gcc python-devel openldap-devel openldap libevent-devel python3-ldap'

          sh 'cp conf/settings.py.example conf/settings.py'

          // wait for the test datebase to come up

          sh 'wait-for-it -s -t 300 127.0.0.1:5432'

no initial comment

rebased onto 2a1d21868a299083b20af4ab9ddba06ce2c1a13e

2 years ago

rebased onto 2e78803b5bbd3edc63d1a88437867dbe57503290

2 years ago

rebased onto 80ca49c5fc3b3edd1041a96add5064b9920592eb

2 years ago

python-devel openldap-devel looks like something that pip needs to build some binaries.

Can you just use python3-ldap?

Yeah, let's use python3-ldap.
/me was trying over and over with creative ways to fix that.

rebased onto d7936272279ec29503937c61775e438322c94c8a

2 years ago

2 new commits added

  • Add ldap to requirements
  • Restrict waiver creation based on users/groups and testcase
2 years ago

rebased onto ca3d2d6d0c98c1ae6e31c38af5ff0b35f63a5cc8

2 years ago

rebased onto c45ffb6a9b51528b3f106de896c4d6cffa6ebfa5

2 years ago

It seems odd that the unit tests use PyPi for deps except for this dep.

rebased onto 4b58abb5a71efe8a44dde2670682ac86bbc1b0df

2 years ago

rebased onto 511a8e64e17d669324f16d5289fc5a22b7fa04e9

2 years ago

I'm making some tests on that... since the CI fails. No review is needed at the moment...
Suggestions are welcome.

1 new commit added

  • Bare commit to trigger CI
2 years ago

Isn't it enough to do git commit --amend --no-edit && git push -f to trigger the CI build?

rebased onto f0731bcd883f6ba77173169f376a710a20775b13

2 years ago

rebased onto 82e9d5c53a0a0aa995be0371f7ccdd67770d234a

2 years ago

rebased onto 3e7dac70304b6cf3a04526efe153d50b14aa381c

2 years ago

rebased onto 71be26638bc7583fcead2ffe923071bfdff8e5ee

2 years ago

rebased onto f655f60d7005752d230f47f0a213cd277cd05a2b

2 years ago

rebased onto b43534f0a09bea392e52e06a0c6c493767df698c

2 years ago

Looks like CI uses the Jenkinsfile from master branch (WAIVERDB_MAIN_BRANCH OpenShift template parameter). From file "openshift/pipelines/templates/waiverdb-build-template.yaml":

- name: WAIVERDB_MAIN_BRANCH
  displayName: Name of the main branch.
  description: If WAIVERDB_MAIN_BRANCH equals WAIVERDB_GIT_REF, this is a post-merge build, otherwise it's a pre-merge build.
  value: master

This doesn't make much sense. For PR (pre-merge build) this should use the new Jenkinsfile, otherwise the master branch can break after PR is merged.

rebased onto d8ffe86759573b3b30f1ca382e160489b7a4d252

2 years ago

@rayson Can you provide some help here? I'm not able to make the pre-merge run correctly even if I think I've put all the dependencies.

I tried to fix using the Jenkinsfile from PR instead of master in #317 and #318, unfortunately it doesn't seem to be possible to specify refspec parameter (+refs/pull/*/head:refs/remotes/origin/pr/*) for Jenkins in OpenShift template to make it possible to fetch the PR branch.

How about moving the code from Jenkinsfile that is expected to change in future to scripts? This could make it also bit clearer.

Looks like you just have to update the test dependencies in "openshift/containers/jenkins-slave/Dockerfile" (#319), commit changes to a branch (e.g. "update-jenkins-slave") and rebuild with:

oc start-build --from-repo=. --commit=update-jenkins-slave waiverdb-premerge-jenkins-slave

Pull-Request has been closed by gnaponie

2 years ago